* sv.po: Take the update done for 1.2.6.

* zh_CN.po, fr.po, cs.po, ja.po: Updated.

30 files changed, 23629 insertions, 22247 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 5270ca926..4bcfe3efe 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-10  Werner Koch  <[email protected]>
+
+	* sv.po: Take the update done for 1.2.6.
+
+	* zh_CN.po, fr.po, cs.po, ja.po: Updated.
+
 2004-10-27  Werner Koch  <[email protected]>
 
 	* LINGUAS: Better don't have comments in this file.
@@ -283,7 +289,7 @@ Wed Jun 14 12:27:09 CEST 2000  Werner Koch  <[email protected]>
 
 2000-06-07 18:26:58  Werner Koch  ([email protected])
 
-  * fr.po: New version from Ga�l
+  * fr.po: New version from Gaël
 
 2000-05-02 10:44:42  Werner Koch  ([email protected])
 
@@ -355,7 +361,7 @@ Mon Oct  4 21:23:04 CEST 1999  Werner Koch  <[email protected]>
 
 Thu Sep 23 06:26:28 1999  Werner Koch  ([email protected])
 
-	* fr.po: Updated by Ga�l.
+	* fr.po: Updated by Gaël.
 
 Sat Sep 18 11:49:51 1999  Werner Koch  ([email protected])
 
@@ -379,7 +385,7 @@ Mon Sep  6 19:59:08 CEST 1999  Werner Koch  <[email protected]>
 
 	* POTFILES.in (delkey.c): New.
 
-	* fr.po: Ga�l was the first to update it again.
+	* fr.po: Gaël was the first to update it again.
 
 Wed Sep  1 15:30:44 CEST 1999  Werner Koch  <[email protected]>
 
@@ -390,7 +396,7 @@ Mon Aug 30 20:38:33 CEST 1999  Werner Koch  <[email protected]>
 	* it.po: Updated (Marco).
 	* de.po: Updated (Walter).
 	* pt_BR-po: Update (Thiago).
-	* fr.po: Updated (Ga�l).
+	* fr.po: Updated (Gaël).
 
 Wed Aug  4 10:34:18 CEST 1999  Werner Koch  <[email protected]>
 
@@ -519,7 +525,7 @@ Mon Sep 21 15:03:44 1998  Werner Koch  (wk@(none))
 
 Mon Sep 21 09:28:54 1998  Werner Koch  (wk@(none))
 
-	* fr.po: New version from Ga�l Qu�ri
+	* fr.po: New version from Gaël Quéri
 
 Tue Aug 11 12:28:11 1998  Werner Koch  (wk@(none))
 
@@ -547,7 +553,7 @@ Fri Mar 13 09:43:19 1998  Werner Koch  ([email protected])
 
 
 
- Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/po/LINGUAS b/po/LINGUAS
index a5aed4abf..5e93f30cc 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -8,7 +8,6 @@ gl
 hu 
 id it
 ja
-nl
 pl pt_BR pt
 ro ru 
 sk sv
diff --git a/po/LINGUAS.contrib b/po/LINGUAS.contrib
new file mode 100644
index 000000000..15f2b6f4a
--- /dev/null
+++ b/po/LINGUAS.contrib
@@ -0,0 +1,4 @@
+# these are languages files for which we don't have a proper disclaimer
+
+nl.po
+
diff --git a/po/be.po b/po/be.po
index 0cdda7db1..099e6402d 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -34,11 +29,12 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -71,9 +67,9 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 ""
@@ -116,89 +112,148 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
-#, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1025
 #, fuzzy, c-format
-msgid "error getting serial number: %s\n"
+msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/app-openpgp.c:1763
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+msgid "error reading application data\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1805
-msgid "reading the key failed\n"
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "паказаць ключы й адбіткі пальцаў"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "стварыць новую пару ключоў"
+
+#: g10/app-openpgp.c:1141
+#, c-format
+msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1812
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1820
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1831
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
+#, c-format
+msgid "PIN [sigs done: %lu]"
+msgstr ""
+
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1734
+#, fuzzy, c-format
+msgid "error getting serial number: %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
+
+#: g10/app-openpgp.c:1829
+#, fuzzy, c-format
+msgid "failed to store the key: %s\n"
+msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
+
+#: g10/app-openpgp.c:1871
+msgid "reading the key failed\n"
+msgstr ""
+
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -283,14 +338,14 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr ""
 
@@ -298,136 +353,145 @@ msgstr ""
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -435,225 +499,246 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit [выйсьці]"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "даведка (help)"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr ""
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr ""
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr ""
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "name"
 msgstr ""
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 msgid "login"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 msgid "cafpr"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 msgid "forcesig"
 msgstr ""
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "агульная памылка"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr ""
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Паўтарыце пароль: "
+
+#: g10/cardglue.c:718
+msgid "PIN not correctly repeated; try again"
+msgstr ""
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -663,13 +748,13 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -710,7 +795,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -729,7 +814,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -754,7 +839,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -851,27 +936,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:361
+#: g10/export.c:384
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
@@ -1050,15 +1135,15 @@ msgstr "не рабіць ніякіх зьменаў"
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1066,7 +1151,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1086,15 +1171,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1104,7 +1189,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1112,478 +1197,478 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr ""
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:2048
+#: g10/g10.c:2079
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2260
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2711
+#: g10/g10.c:2744
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2713
+#: g10/g10.c:2746
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -1591,26 +1676,26 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:186 g10/getkey.c:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2169
+#: g10/getkey.c:2189
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2400
+#: g10/getkey.c:2420
 #, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -1876,373 +1961,373 @@ msgstr "Даведка адсутнічае"
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:874
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1204
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1318
+#: g10/import.c:1320
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1336
+#: g10/import.c:1338
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1516
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1531
+#: g10/import.c:1533
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1553
+#: g10/import.c:1555
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1653
+#: g10/import.c:1655
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1729
+#: g10/import.c:1731
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1788
+#: g10/import.c:1790
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
@@ -2463,7 +2548,7 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
 #: g10/keyedit.c:918
@@ -2509,7 +2594,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2540,7 +2625,7 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
@@ -3000,292 +3085,287 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, c-format
-msgid "This key may be revoked by %s key "
+msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-msgid "revoked"
-msgstr ""
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-msgid "expired"
-msgstr ""
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+msgid "revoked"
+msgstr ""
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+msgid "expired"
+msgstr ""
+
+#: g10/keyedit.c:2536
 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:2599
+#: g10/keyedit.c:2596
 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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 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:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3327,12 +3407,12 @@ msgstr ""
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
@@ -3399,81 +3479,60 @@ msgstr ""
 
 #: g10/keygen.c:1353
 #, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
+msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1355
 #, c-format
-msgid "   (%d) RSA (sign only)\n"
+msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr ""
 
 #: g10/keygen.c:1356
 #, c-format
-msgid "   (%d) RSA (encrypt only)\n"
+msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
 #: g10/keygen.c:1358
 #, c-format
-msgid "   (%d) RSA (set your own capabilities)\n"
+msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1409
+#: g10/keygen.c:1360
 #, c-format
-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 ""
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr ""
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr ""
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, c-format
+msgid "DSA keypair will have %u bits.\n"
 msgstr ""
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr ""
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1447
-msgid "Are you sure that you want this keysize? (y/N) "
+#: g10/keygen.c:1446
+#, c-format
+msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3483,7 +3542,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3493,39 +3552,39 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3535,44 +3594,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3580,38 +3639,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1750
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3619,7 +3678,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3627,109 +3686,105 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr ""
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
 msgstr ""
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3775,28 +3830,28 @@ msgstr ""
 msgid "expired: %s)"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4147,7 +4202,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
@@ -4179,27 +4234,39 @@ msgstr ""
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr ""
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
+#: g10/misc.c:299
+#, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr ""
+
+#: g10/misc.c:314
+#, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
 msgstr ""
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/misc.c:334
+#, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
 #: g10/misc.c:430
@@ -4306,50 +4373,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4360,40 +4427,40 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "пароль занадта доўгі\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batch mode\n"
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
+msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4403,17 +4470,17 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
@@ -4596,7 +4663,7 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr ""
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+msgid "         This could mean that the signature is forged.\n"
 msgstr ""
 
 #: g10/pkclist.c:527
@@ -4695,28 +4762,28 @@ msgstr ""
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -5012,49 +5079,44 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "запіс у stdout\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -5236,12 +5298,12 @@ msgstr ""
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5291,84 +5353,119 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "памылка чытаньня файла"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "збой падпісаньня: %s\n"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "невядомая вэрсыя"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5675,6 +5772,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "запіс у stdout\n"
+
+#, fuzzy
 #~ msgid "can't create file `%s': %s\n"
 #~ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
@@ -5682,10 +5783,6 @@ msgstr ""
 #~ msgid "can't open file `%s': %s\n"
 #~ msgstr "немагчыма адкрыць %s: %s\n"
 
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "збой падпісаньня: %s\n"
-
 #~ msgid "%s: can't create directory: %s\n"
 #~ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
diff --git a/po/ca.po b/po/ca.po
index 19de2bfa8..72f377601 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -35,12 +35,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-"l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -55,11 +49,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -94,9 +89,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "no s'ha pogut crear �%s�: %s\n"
@@ -151,90 +146,150 @@ msgstr ""
 "sistema tinga oportunitat de recollir m�s entropia. (Calen %d bytes "
 "m�s)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: error en llegir el registre lliure: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "�%s� ja est� comprimida\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera un nou parell de claus"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -328,15 +383,15 @@ msgstr ""
 
 # Dest�s? ivb
 # Desat�s, s�. jm
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Seleccioneu: "
 
@@ -344,17 +399,17 @@ msgstr "Seleccioneu: "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "No s'ha especificat cap ra�"
@@ -363,127 +418,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:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "no processat"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau p�blica corresponent: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de �%s�: %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncies actualitzades"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, 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:658
+#: g10/card-util.c:746
 #, 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:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital �s inv�lida\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital �s inv�lida\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generaci� de claus ha fallat: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP v�lides.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -491,235 +555,259 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "La selecci� �s inv�lida.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la ra� de la revocaci�:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecci� �s desconegut\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja �s present\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "ix"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ix del men�"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "ajuda"
 
 # �pantalla� o �ajuda�?  ivb
 # �ajuda�, evidentment. jm
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "llista"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau �s disponible en: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depura"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confian�a"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "error general"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Introdu�u el nom d'usuari: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Introdu�u el nom d'usuari: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introdu�u el nom d'usuari: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repetiu la contrasenya: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -729,13 +817,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -781,7 +869,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "utilitzeu l'opci� �--delete-secret-keys� per a eliminar-la primer.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
@@ -800,7 +888,7 @@ msgstr "Ha fallat el proc�s de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "�%s� ja est� comprimida\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AV�S: �%s� �s un fitxer buit\n"
@@ -830,7 +918,7 @@ msgstr ""
 "for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del "
 "destinatari\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -941,28 +1029,28 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no est� protegida - es descarta\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "AV�S: no s'ha exportat res\n"
 
@@ -1144,15 +1232,15 @@ msgstr "no fa cap canvi"
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1163,7 +1251,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:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1183,15 +1271,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'�s: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1206,7 +1294,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:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1214,480 +1302,480 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Clau p�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Dispersi�: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compressi�: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "forma d'�s: gpg [opcions] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, 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:1182
+#: g10/g10.c:1217
 #, 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:1185
+#: g10/g10.c:1220
 #, 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:1191
+#: g10/g10.c:1226
 #, 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:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, 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:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions �%s�\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades �%s�\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions �%s�: %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de �%s�\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, 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:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importaci� no v�lides\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportaci� no v�lides\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: 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:2553
+#: 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:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no t� sentit amb %s!\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no �s v�lid\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificaci� seleccionat no �s v�lid\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 #, 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:2713
+#: g10/g10.c:2746
 #, 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "les prefer�ncies per defecte s�n inv�lides\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "les prefer�ncies personals de xifrat s�n inv�lides\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "les prefer�ncies personals de digest s�n inv�lides\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "les prefer�ncies personals de compressi� s�n inv�lides\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, 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:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportaci� de la clau ha fallat: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersi� �s inv�lid �%s�\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1695,23 +1783,23 @@ msgstr ""
 "un nom de notaci� nom�s pot tenir car�cters imprimibles o espais i "
 "acabar amb el signe �=�\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 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:3878
+#: g10/g10.c:3911
 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:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de pol�tica de signatura donada no �s v�lida\n"
@@ -1721,29 +1809,29 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %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:2447
+#: g10/getkey.c:2467
 #, 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"
@@ -2127,254 +2215,254 @@ msgstr "No hi ha ajuda disponible"
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Heu signat els seg�ents ID d'usuari:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupci� de la subclau HKP reparada\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no �s v�lid\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell �%s�: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, 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:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: �%s� 1 signatura nova\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: �%s� %d signatures noves\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: �%s� 1 subclau nova\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: �%s� %d subclaus noves\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: �%s� no ha estat modificada\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, 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:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2384,23 +2472,23 @@ msgstr ""
 # O �rebutjara�? ivb
 # Per tots els canvis d'anglicisme �ignorat� -> �es descarta�,
 # �es rebutja� est� b�. jm
-#: g10/import.c:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, 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:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2408,114 +2496,114 @@ msgstr ""
 "�%s�\n"
 "\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enlla� de subclau �s inv�lid\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocaci� no v�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, 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:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@ -2752,7 +2840,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 "Seleccioneu una opci� (introdu�u �?� per obtindre m�s "
 "informaci�):"
@@ -2827,7 +2916,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2858,7 +2947,7 @@ msgstr ""
 "Introdu�u la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -3351,83 +3440,67 @@ msgstr ""
 
 # Potser %s haja d'anar darrere de �clau�.  ivb
 # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revocada]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3436,7 +3509,19 @@ msgstr ""
 "necess�riament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revocada]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3446,7 +3531,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3455,49 +3540,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3507,168 +3592,168 @@ msgstr ""
 "pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introdu�u l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 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:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, 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:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: �"
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari �%s� ja est� revocat\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3711,12 +3796,12 @@ msgstr "s'est� escrivint l'autosignatura\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -3784,93 +3869,60 @@ msgstr "   (%d) DSA (nom�s signar)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nom�s xifrar)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nom�s xifrar)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nom�s signar)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nom�s xifrar)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Preparat per a generar un nou parell de claus %s.\n"
-"              grand�ria m�nima:  768 bits\n"
-"      grand�ria predeterminada: 1024 bits\n"
-"  grand�ria m�xima aconsellada: 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Quina grand�ria voleu? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus "
-"RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
 
-# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons.  ivb
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"No es recomanen claus m�s llargues de 2048 bits perqu�\n"
-"els c�lculs s�n VERITABLEMENT llargs!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Segur que voleu aquesta grand�ria? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Quina grand�ria voleu? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� "
-"son molt vulnerables als atacs!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La grand�ria sol�licitada �s %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3886,7 +3938,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3902,31 +3954,31 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "el valor no �s v�lid\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca el %s\n"
 
 # Amb �it� es refereix a les dates?  ivb
 # Aix� vaig entendre jo. jm
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3934,12 +3986,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�s correcte? (s/n)"
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3956,44 +4008,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Hi ha un car�cter inv�lid en el camp *nom*\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot comen�ar amb un d�git\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 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:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Adre�a electr�nica: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "No �s una adre�a v�lida\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un car�cter inv�lid en el camp *comentari*\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de car�cters `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4004,30 +4056,30 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4035,12 +4087,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -4052,7 +4104,7 @@ msgstr ""
 "useu aquest programa amb l'opci� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -4065,59 +4117,55 @@ msgstr ""
 "aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "La generaci� de claus ha estat cancel�lada.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'est� escrivint la clau p�blica a �%s�\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'est� escrivint la clau secreta a �%s�\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, 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:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, 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:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, 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:2927
+#: g10/keygen.c:2939
 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:2938
+#: g10/keygen.c:2950
 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"
@@ -4125,13 +4173,13 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, 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:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4140,7 +4188,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4148,40 +4196,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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, 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:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear �%s�: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4227,28 +4275,28 @@ msgstr "Anell"
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau prim�ria:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau prim�ria:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4615,7 +4663,7 @@ msgstr "binari"
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "desconeguda"
 
@@ -4649,30 +4697,42 @@ 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:101
+#: g10/misc.c:105
 #, 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:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, 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:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "No haur�eu d'usar algoritmes experimentals!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "l'algoritme de xifratge no �s implementat"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s "
-"est�ndard!\n"
+"for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
+"destinatari\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4791,46 +4851,46 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d t� el bit cr�tic activat\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no est� disponible en aquesta sessi�\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "no es pot establir el pid del client per l'agent\n"
 
 # llija/llegisca/llegesca.  ivb
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "no es pot fer que el servidor llegesca el DF per a l'agent\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "no es pot fer que el servidor escriga el DF per a l'agent\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO �s malformada\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versi� %d del protocol de gpg-agent no est� suportada\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb �%s�: %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicaci� amb el gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 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:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4846,7 +4906,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:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4857,41 +4917,41 @@ 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:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Introdu�u la contrasenya\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "la contrasenya �s massa llarga\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "la resposta de l'agent �s inv�lida\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "s'ha cancel�lat per l'usuari\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, 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"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "no es pot demanar la contrasenya en mode desat�s\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Introdu�u la contrasenya: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4901,17 +4961,17 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
@@ -5122,7 +5182,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "      A�� podria significar que la signatura �s falsificada.\n"
 
 #: g10/pkclist.c:527
@@ -5225,30 +5286,30 @@ msgstr "no hi ha adreces v�lides\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "les dades no s'han desat; useu l'opci� \"--output\" per desar-les\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear �%s�: %s\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Introdu�u el nom del fitxer de dades: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "s'est� llegint d'stdin...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
@@ -5590,12 +5651,7 @@ msgstr ""
 "nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre "
 "esteu en mode --pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "s'est� escrivint en �%s�\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5603,41 +5659,41 @@ msgstr ""
 "for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
 "destinatari\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzar� xifratge %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta �%s�: duplicat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta �%s�: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja �s present\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5830,12 +5886,12 @@ msgstr ""
 "la base de dades de confian�a est� corrompuda; per favor, executeu "
 "�gpg --fix-trustdb�.\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la l�nia d'entrada �s superior a %d car�cters\n"
@@ -5887,93 +5943,128 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocada]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[caducada]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "desconeguda"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr ""
 "no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
 "\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 "la pr?xima comprovaci� de la base de dades de confian�a ser� el %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
 "\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no �s necess�ria una comprovaci� de la base de dades de confian�a\n"
 "\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "no s'ha trobat la clau p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "s'est� comprovant la base de dades de confian�a\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confian�a absoluta\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau p�blica de la clau amb confian�a absoluta %08lX\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confian�a %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -6306,6 +6397,67 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "l'algorisme de resum �%s� es de nom�s lectura en aquesta versi�\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 ""
+#~ "Preparat per a generar un nou parell de claus %s.\n"
+#~ "              grand�ria m�nima:  768 bits\n"
+#~ "      grand�ria predeterminada: 1024 bits\n"
+#~ "  grand�ria m�xima aconsellada: 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA nom�s permet claus entre 512 i 1024 bits\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "la clau �s massa petita; 1024 bits ?s el m�nim perm�s per a claus "
+#~ "RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "la clau �s massa petita; 768 bits �s el m�nim perm�s.\n"
+
+# Jo tinc Deep Thought MMX a casa i m'ho fa en 42 segons.  ivb
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "la clau �s massa llarga; %d �s el m�xim perm�s.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "No es recomanen claus m�s llargues de 2048 bits perqu�\n"
+#~ "els c�lculs s�n VERITABLEMENT llargs!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Segur que voleu aquesta grand�ria? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "D'acord, per� sapieu que la radiaci� del monitor i del teclat tamb� "
+#~ "son molt vulnerables als atacs!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "No haur�eu d'usar algoritmes experimentals!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "aquest algoritme de xifratge est� desaconsellat; useu-ne un de m�s "
+#~ "est�ndard!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "s'est� escrivint en �%s�\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "no es pot fet aix� en mode desat�s\n"
 
@@ -6437,12 +6589,6 @@ msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? hi ha problemes en la comprovaci� de la revocaci�: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revocada]"
-
-#~ msgid "[expired] "
-#~ msgstr "[caducada]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [caduca: %s]"
diff --git a/po/cs.po b/po/cs.po
index ea68e88ad..1fdc0c0db 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,25 +3,20 @@
 # Magda Proch�zkov� <[email protected]> 2001, Roman Pavlik <[email protected]> 2001, 2002, 2003, 2004.
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-1.2.3\n"
+"Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
-"PO-Revision-Date: 2003-12-07 16:20+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "hashovac� algoritmus `%s' je v tomto release read-only\n"
-
 #: cipher/primegen.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
+msgstr "nemohu vygenerovat prvo��slo s  pbits=%u qbits=%u\n"
 
 #: cipher/primegen.c:311
 #, c-format
@@ -32,11 +27,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -69,9 +65,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "nemohu vytvo�it `%s': %s\n"
@@ -124,90 +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:534
-#, fuzzy, c-format
+#: g10/app-openpgp.c:539
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
+msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:552
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
+msgstr "ulo�en� datumu vytvo�en� se nezda�ilo: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
-msgstr ""
+msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
-#, fuzzy, c-format
+#: 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
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
+msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "karta je trvale uzam�ena!\n"
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, 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:818
-msgid "Admin PIN"
-msgstr ""
+#: g10/app-openpgp.c:865
+#, fuzzy
+msgid "|A|Admin PIN"
+msgstr "PIN administr�tora"
 
-#: g10/app-openpgp.c:1301
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:1021
+#, fuzzy
+msgid "|AN|New Admin PIN"
+msgstr "PIN administr�tora"
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1025
 #, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
+msgid "error getting new PIN: %s\n"
+msgstr "chyba p�i z�sk�n� s�riov�ho ��sla: %s\n"
 
-#: g10/app-openpgp.c:1668
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "chyba p�i vytv��en� hesla: %s\n"
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "chyba p�i �ten� bloku kl��e: %s\n"
 
-#: g10/app-openpgp.c:1763
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: chyba p�i �ten� voln�ho z�znamu: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1107
 #, fuzzy
-msgid "reading the key failed\n"
-msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
+msgid "key already exists\n"
+msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "vytvo�it nov� p�r kl���"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1831
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "�ten� kl��e se nezda�ilo\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+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
+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
 msgid "response does not contain the RSA public exponent\n"
+msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
+#, c-format
+msgid "PIN [sigs done: %lu]"
+msgstr "PIN [podpis hotov: %lu]"
+
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#, 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
+#, 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
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "nelze ulo�it kl��: %s\n"
+
+#: g10/app-openpgp.c:1871
+msgid "reading the key failed\n"
+msgstr "�ten� kl��e se nezda�ilo\n"
+
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -230,18 +288,17 @@ msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
 #: g10/armor.c:551
-#, fuzzy
 msgid "unexpected armor: "
-msgstr "neo�ek�van� k�dov�n� ASCII:"
+msgstr "neo�ek�van� ASCII armor: "
 
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
 #: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "neplatn� znak form�tu radix64 %02x byl p�esko�en\n"
+msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
@@ -256,12 +313,11 @@ msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
 #: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "Chyba CRC; %06lx - %06lx\n"
+msgstr "Chyba CRC; %06lX - %06lX\n"
 
 #: g10/armor.c:824
-#, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
@@ -286,399 +342,405 @@ msgstr ""
 "�patn� MTA\n"
 
 #: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "tajn� kl�� nen� dostupn�"
+msgstr "OpenPGp karta nen� dostupn�: %s\n"
 
 #: g10/card-util.c:63
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:376
-#, fuzzy
+#: g10/card-util.c:378
 msgid "male"
-msgstr "enable"
+msgstr "mu�"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "female"
-msgstr "enable"
+msgstr "�ena"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "unspecified"
-msgstr "D�vod nebyl specifikov�n"
+msgstr "neuvedeno"
 
-#: g10/card-util.c:396
-#, fuzzy
+#: g10/card-util.c:406
 msgid "not forced"
-msgstr "nezpracov�no"
+msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
-msgstr ""
+msgstr "vy�adov�no"
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:502
-#, fuzzy
+#: g10/card-util.c:521
 msgid "URL to retrieve public key: "
-msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
+msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, 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
+msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:641
-#, fuzzy
+#: g10/card-util.c:709
+#, 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
 msgid "Language preferences: "
-msgstr "aktualizovat p�edvolby"
+msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:649
-#, fuzzy
+#: g10/card-util.c:737
 msgid "Error: invalid length of preference string.\n"
-msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
+msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:658
-#, fuzzy
+#: g10/card-util.c:746
 msgid "Error: invalid characters in preference string.\n"
-msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
+msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:693
-#, fuzzy
+#: g10/card-util.c:781
 msgid "Error: invalid response.\n"
-msgstr "chyba: neplatn� fingerprint\n"
+msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:714
-#, fuzzy
+#: g10/card-util.c:802
 msgid "CA fingerprint: "
-msgstr "vypsat fingerprint"
+msgstr "CA fingerprint: "
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:825
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "chyba: neplatn� fingerprint\n"
+msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:785
-#, fuzzy, c-format
+#: g10/card-util.c:873
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
+msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:786
-#, fuzzy
+#: g10/card-util.c:874
 msgid "not an OpenPGP card"
-msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
+msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:795
-#, fuzzy, c-format
+#: g10/card-util.c:883
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "chyba p�i z�pisu do souboru tajn�ch kl��� `%s': %s\n"
+msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, 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 ""
+"Pros�m nezapome�te, �e tov�rn� nastaven� PINu je\n"
+"   PIN = `%s'     PIN administr�tora = `%s'\n"
+"Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:968
-#, fuzzy
+#: g10/card-util.c:1056
 msgid "Please select the type of key to generate:\n"
-msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
+msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
-#, fuzzy
+#: g10/card-util.c:1058 g10/card-util.c:1138
 msgid "   (1) Signature key\n"
-msgstr "Platnost podpisu skon�ila %s\n"
+msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
-#, fuzzy
+#: g10/card-util.c:1059 g10/card-util.c:1140
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
+msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1047
-#, fuzzy
+#: g10/card-util.c:1135
 msgid "Please select where to store the key:\n"
-msgstr "Pros�m vyberte d�vod revokace:\n"
+msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1082
-#, fuzzy
+#: g10/card-util.c:1170
 msgid "unknown key protection algorithm\n"
-msgstr "nezn�m� kompresn� algoritmus\n"
+msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1087
-#, fuzzy
+#: g10/card-util.c:1175
 msgid "secret parts of key are not available\n"
-msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
+msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1092
-#, fuzzy
+#: g10/card-util.c:1180
 msgid "secret key already stored on a card\n"
-msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
+msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "ukon�it"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "u"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
-#: g10/card-util.c:1164
-#, fuzzy
+#: g10/card-util.c:1252
 msgid "show admin commands"
-msgstr "konfliktn� p��kazy\n"
+msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
-#, fuzzy
+#: g10/card-util.c:1255
 msgid "list all available data"
-msgstr "Kl�� k dispozici na: "
+msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
-#, fuzzy
+#: g10/card-util.c:1258
 msgid "name"
-msgstr "enable"
+msgstr "jm�no"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
-msgstr ""
+msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
-msgstr ""
+msgstr "url"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
-msgstr ""
+msgstr "fetch"
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "login"
-msgstr "lsign"
+msgstr "login"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "change the login name"
-msgstr "zm�nit dobu platnosti"
+msgstr "zm�nit login name"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
-msgstr ""
+msgstr "lang"
 
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1263
 msgid "change the language preferences"
-msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
+msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
-msgstr ""
+msgstr "sex"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
-msgstr ""
+msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "cafpr"
-msgstr "fpr"
+msgstr "cafpr"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "change a CA fingerprint"
-msgstr "vypsat fingerprint"
+msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1178
-#, fuzzy
+#: g10/card-util.c:1266
 msgid "forcesig"
-msgstr "revsig"
+msgstr "forcesig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1180
-#, fuzzy
+#: g10/card-util.c:1268
 msgid "generate"
-msgstr "obecn� chyba"
+msgstr "generate"
 
-#: g10/card-util.c:1181
-#, fuzzy
+#: g10/card-util.c:1269
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
+msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
+
+#: g10/card-util.c:1272
+msgid "privatedo"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1281
-#, fuzzy
+#: g10/card-util.c:1371
 msgid "Admin-only command\n"
-msgstr "konfliktn� p��kazy\n"
+msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1297
-#, fuzzy
+#: g10/card-util.c:1387
 msgid "Admin commands are allowed\n"
-msgstr "konfliktn� p��kazy\n"
+msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1389
 msgid "Admin commands are not allowed\n"
-msgstr "zapisuji tajn� kl�� do `%s'\n"
+msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
+"   %.*s\n"
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 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:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Vlo�te PIN administr�tora: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Vlo�te PIN: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
-msgstr ""
+msgstr "Vlo�te PIN: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Opakujte heslo: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -688,13 +750,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "kl�� `%s' nenalezen: %s\n"
+msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -705,19 +767,16 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dokud neur��te kl�� jeho fingerprintem)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Smazat tento kl�� ze souboru kl���? "
+msgstr "Smazat tento kl�� ze souboru kl���? (a/N) "
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "Toto je tajn� kl��! - opravdu smazat? "
+msgstr "Toto je tajn� kl��! - opravdu smazat? (a/N) "
 
 #: g10/delkey.c:157
 #, c-format
@@ -738,7 +797,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -757,7 +816,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -778,18 +837,20 @@ msgid ""
 msgstr "algoritmus IDEA nelze pou��t pro v�echny kl��e, pro kter� �ifrujete.\n"
 
 #: g10/encode.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
+msgstr ""
+"VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:648 g10/sign.c:876
-#, fuzzy, c-format
+#: g10/encode.c:648 g10/sign.c:877
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
+"VAROV�N�: vy��dan� komprima�n� algoritmus %s (%d) nevyhovuje p�edvolb�m "
+"p��jemce\n"
 
 #: g10/encode.c:735
 #, c-format
@@ -842,21 +903,20 @@ msgstr ""
 "nastaveny nebezpe�n�\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "na t�to platform� jsou p�i vol�n� extern�ch program� vy�adov�ny\n"
 "do�asn� soubory (temp files)\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "nelze spustit %s \"%s\": %s\n"
+msgstr "nelze spustit program `%s': %s\n"
 
 #: g10/exec.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "nelze spustit %s \"%s\": %s\n"
+msgstr "nelze spustit shell `%s': %s\n"
 
 #: g10/exec.c:521
 #, c-format
@@ -886,27 +946,26 @@ 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:176
-#, fuzzy
+#: g10/export.c:182
 msgid "exporting secret keys not allowed\n"
-msgstr "zapisuji tajn� kl�� do `%s'\n"
+msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:206
-#, fuzzy, c-format
+#: g10/export.c:211
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "kl�� %08lX: nen� chr�n�n� - p�esko�eno\n"
+msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:214
-#, fuzzy, c-format
+#: g10/export.c:219
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "kl�� %08lX: PGP 2.x kl�� - p�esko�eno\n"
+msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:361
-#, fuzzy, c-format
+#: g10/export.c:384
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "VAROV�N�: tajn� kl�� %08lX nen� chr�n�n pomoc� simple SK checksum\n"
+msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
@@ -955,9 +1014,8 @@ msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
 #: g10/g10.c:374
-#, fuzzy
 msgid "list and check key signatures"
-msgstr "zkontrolovat podpisy kl���"
+msgstr "vypsat a zkontrolovat podpisy kl���"
 
 #: g10/g10.c:375
 msgid "list keys and fingerprints"
@@ -1021,15 +1079,15 @@ msgstr "importovat/slou�it kl��e"
 
 #: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "vytisknout stav karty"
 
 #: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "zm�nit data na kart�"
 
 #: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "zm�nit PIN karty"
 
 #: g10/g10.c:410
 msgid "update the trust database"
@@ -1089,15 +1147,15 @@ msgstr "neprov�d�t ��dn� zm�ny"
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1105,7 +1163,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1123,17 +1181,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 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"
+"P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1143,7 +1201,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1151,472 +1209,479 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:982
-#, fuzzy, c-format
+#: g10/g10.c:1017
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "no = podpis nalezen v definici skupiny \"%s\"\n"
+msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
-#: g10/g10.c:1179
-#, fuzzy, c-format
+# g10/g10.c:1179#, c-format
+#: g10/g10.c:1214
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1182
-#, fuzzy, c-format
+#: g10/g10.c:1217
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1185
-#, fuzzy, c-format
+#: g10/g10.c:1220
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "VAROV�N�: vlastnictv� pro %s nastaveno nebezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1191
-#, fuzzy, c-format
+#: g10/g10.c:1226
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1194
-#, fuzzy, c-format
+#: g10/g10.c:1229
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1197
-#, fuzzy, c-format
+#: g10/g10.c:1232
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "VAROV�N�: p��stupov� pr�va pro %s nejsou nastavena bezpe�n� \"%s\"\n"
+msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1203
-#, fuzzy, c-format
+#: g10/g10.c:1238
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
+"nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1206
-#, fuzzy, c-format
+#: g10/g10.c:1241
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
+"nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1209
-#, fuzzy, c-format
+#: g10/g10.c:1244
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "VAROV�N�: vlastnictv� adres��e %s nastaveno nebezpe�n� \"%s\"\n"
+msgstr ""
+"VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
+"nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1215
-#, fuzzy, c-format
+#: g10/g10.c:1250
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
-"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
+"VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
+"bezpe�n� `%s'\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/g10.c:1253
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
-"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
+"VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
+"nastavena bezpe�n� `%s'\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/g10.c:1256
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
-"VAROV�N�: p��stupov� pr�va adres��e %s nejsou nastavena bezpe�n� \"%s\"\n"
+"VAROV�N�: p��stupov� pr�va k adres��i s roz�i�uj�c�m modulem nejsou "
+"nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/g10.c:1362
-#, fuzzy, c-format
+#: g10/g10.c:1397
+#, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
-#, fuzzy, c-format
+#: g10/g10.c:2079
+#, 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 "
+"�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/g10.c:2260
-#, fuzzy, c-format
+#: g10/g10.c:2293
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s nen� platn� znakov� sada\n"
+msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
-#, fuzzy
+#: g10/g10.c:2312 g10/keyedit.c:3434
 msgid "could not parse keyserver URL\n"
-msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
+msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/g10.c:2285
-#, fuzzy, c-format
+#: g10/g10.c:2318
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: neplatn� parametr pro export\n"
+msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2288
-#, fuzzy
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
-msgstr "neplatn� parametr pro export\n"
+msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2315
-#, fuzzy, c-format
+#: g10/g10.c:2348
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: neplatn� parametr pro import\n"
+msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2318
-#, fuzzy
+#: g10/g10.c:2351
 msgid "invalid list options\n"
-msgstr "neplatn� parametr pro import\n"
+msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2340
-#, fuzzy, c-format
+#: g10/g10.c:2373
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: neplatn� parametr pro export\n"
+msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2343
-#, fuzzy
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
-msgstr "neplatn� parametr pro export\n"
+msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2684
-#, fuzzy
+#: g10/g10.c:2717
 msgid "selected compression algorithm is invalid\n"
-msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
+msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 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:2707
+#: g10/g10.c:2740
 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:2709
-#, fuzzy
+#: g10/g10.c:2742
 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/g10.c:2824
-#, fuzzy, c-format
+#: g10/g10.c:2857
+#, 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"
+msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2829
-#, fuzzy, c-format
+#: g10/g10.c:2862
+#, 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"
+msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2834
-#, fuzzy, c-format
+#: g10/g10.c:2867
+#, 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"
+msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:2961
-#, fuzzy, c-format
+#: g10/g10.c:2994
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "de�ifrov�n� selhalo: %s\n"
+msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:2984
-#, fuzzy
+#: g10/g10.c:3017
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [jm�no souboru]"
+msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/g10.c:2989
-#, fuzzy, c-format
+#: g10/g10.c:3022
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3035
-#, fuzzy
+#: g10/g10.c:3068
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [jm�no souboru]"
+msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/g10.c:3040
-#, fuzzy, c-format
+#: g10/g10.c:3073
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
+msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u�ivatele"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u�ivatele"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 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:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1624,57 +1689,54 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/g10.c:3911
-#, fuzzy
+#: g10/g10.c:3944
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
+msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
 #: g10/getkey.c:150
 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:2691
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2711
 msgid "[User ID not found]"
-msgstr "[User ID not found]"
+msgstr "[ID u�ivatele nenalezeno]"
 
 # c-format
-#: g10/getkey.c:1614
-#, fuzzy, c-format
+#: g10/getkey.c:1639
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr ""
-"Neplatn� kl�� %08lX zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
+msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2169
-#, fuzzy, c-format
+#: g10/getkey.c:2189
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %08lX - ignorov�no\n"
+msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2400
-#, fuzzy, c-format
+#: g10/getkey.c:2420
+#, c-format
 msgid "using secondary key %s instead of primary key %s\n"
-msgstr "pou��v�m sekund�rn� kl�� %08lX m�sto prim�rn�ho kl��e %08lX\n"
+msgstr "pou��v�m sekund�rn� kl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2447
-#, fuzzy, c-format
+#: g10/getkey.c:2467
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "kl�� %08lX: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
+msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
 #: g10/gpgv.c:68
 msgid "be somewhat more quiet"
@@ -1750,6 +1812,16 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"Vyberte algoritmus, kter� chcete pou��t.\n"
+"\n"
+"DSA (alias DSS) je Digital Signature Algorithm a m��e b�t pou�it pouze pro\n"
+"podepisov�n�.\n"
+"\n"
+"Elgamal je pouze �ifrovac� algoritmus.\n"
+"\n"
+"RSA m��e b�t pou�it pro �ifrov�n� anebo podepisov�n�.\n"
+"\n"
+"Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, pomoc� kter�ho lze podepisovat."
 
 #: g10/helptext.c:83
 msgid ""
@@ -1886,7 +1958,6 @@ msgstr ""
 "Pokud nev�te, jak� je spr�vn� odpov��, odpov�zte \"0\"."
 
 #: g10/helptext.c:185
-#, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr ""
 "Pokud chcete podepsat V�ECHNY identifik�tory u�ivatel�, odpov�zte \"ano\""
@@ -2028,384 +2099,381 @@ msgstr "Pomoc nen� k dispozici"
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:258
+#, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifik�tor� (user ID): %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importov�no: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zm�n: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nov� id u�ivatel� (user ID): %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nov� podkl��e: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nov� podpisy: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nov� revokace kl���: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportov�no: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:545
-#, fuzzy
+#: g10/import.c:547
 msgid "algorithms on these user IDs:\n"
-msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
+msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:596
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "podpis %s, hashovac� algoritmus %s\n"
+msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:621
+#: g10/import.c:623
 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:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
-msgstr ""
+msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:695 g10/import.c:1049
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "kl�� %08lX: chyb� identifik�tor u�ivatele\n"
+msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:715
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "kl�� %08lX: HKP po�kozen� podkl��e opraveno\n"
+msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:730
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "kl�� %08lX: p�ijat id u�ivatele '%s',kter� nen� podeps�n j�m sam�m\n"
+msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:736
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "kl�� %08lX: chyb� platn� identifik�tor u�ivatele\n"
+msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:748 g10/import.c:1170
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "kl�� %08lX: ve�ejn� kl�� nenalezen: %s\n"
+msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:754
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "kl�� %08lX: nov� kl�� - p�esko�en\n"
+msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, 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
+# 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
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:793
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "kl�� %08lX: ve�ejn� kl�� \"%s\" importov�n\n"
+msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:817
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "kl�� %08lX: neodpov�d� na�� kopii\n"
+msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:834 g10/import.c:1188
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "kl�� %08lX: nemohu naj�t origin�ln� blok kl��e: %s\n"
+msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:842 g10/import.c:1195
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "kl�� %08lX: nemohu ��st origin�ln� blok kl��e: %s\n"
+msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:874
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "kl�� %08lX: \"%s\" 1 nov� identifik�tor u�ivatele\n"
+msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:877
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "kl�� %08lX: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:880
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "kl�� %08lX: \"%s\" 1 nov� podpis\n"
+msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:883
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "kl�� %08lX: \"%s\" %d nov�ch podpis�\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:886
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "kl�� %08lX: \"%s\" 1 nov� podkl��\n"
+msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:889
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "kl�� %08lX: \"%s\" %d nov�ch podkl���\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:910
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "kl�� %08lX: \"%s\" beze zm�n\n"
+msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1055
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "kl�� %08lX: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
+msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1066
 msgid "importing secret keys not allowed\n"
-msgstr "zapisuji tajn� kl�� do `%s'\n"
+msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1094
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "kl�� %08lX: tajn� kl�� importov�n\n"
+msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1123
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "kl�� %08lX: je ji� v souboru tajn�ch kl���\n"
+msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1133
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "kl�� %08lX: nenalezen tajn� kl��: %s\n"
+msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1163
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr ""
-"kl�� %08lX: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
+msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1206
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "kl�� %08lX: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
+msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1238
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "kl�� %08lX: \"%s\" revoka�n� certifik�t importov�n\n"
+msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1303
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "kl�� %08lX: neexistuje id u�ivatele pro podpis\n"
+msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1318
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
-"kl�� %08lX: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id \"%s"
+"kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1320
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr ""
-"kl�� %08lX: neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
+msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1338
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "kl�� %08lX: neexistuje podkl�� pro v�z�n� kl���\n"
+msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1349 g10/import.c:1399
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "kl�� %08lX: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
+msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1351
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "kl�� %08lX: neplatn� vazba podkl��e\n"
+msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1366
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "kl�� %08lX: smaz�na v�cen�sobn� vazba podkl��e\n"
+msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1388
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "kl�� %08lX: neexistuje podkl�� pro revokaci kl��e\n"
+msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1401
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "kl�� %08lX: neplatn� revoka�n� podkl��\n"
+msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1416
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "kl�� %08lX: smaz�na v�cen�sobn� revokace podkl��e\n"
+msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1458
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "kl�� %08lX: identifik�tor u�ivatele p�esko�en '"
+msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1479
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "kl�� %08lX: podkl�� p�esko�en\n"
+msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1504
-#, fuzzy, c-format
+#: g10/import.c:1506
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "kl�� %08lX: podpis nen� exportovateln� (t��da %02x) - p�esko�eno\n"
+msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1516
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "kl�� %08lX: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
+msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1533
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "kl�� %08lX: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
+msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1547
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "kl�� %08lX: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
+msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1555
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "kl�� %08lX: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
+msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1653
-#, fuzzy, c-format
+#: g10/import.c:1655
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "kl�� %08lX: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
+msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1715
-#, fuzzy, c-format
+#: g10/import.c:1717
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"VAROV�N�: kl�� %08lX m��e b�t revokov�n: zkou��m z�skat revoka�n�kl�� %08lX\n"
+"VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1729
-#, fuzzy, c-format
+#: g10/import.c:1731
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr ""
-"VAROV�N�: kl�� %08lX m��e b�t revokov�n: revoka�n� kl�� %08lX nenalezen.\n"
+msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1788
-#, fuzzy, c-format
+#: g10/import.c:1790
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "kl�� %08lX: \"%s\" p�id�n revoka�n� certifik�t\n"
+msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1822
-#, fuzzy, c-format
+#: g10/import.c:1824
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "kl�� %08lX: podpis kl��e j�m sam�m (direct key signature)\n"
+msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
 #: g10/keydb.c:167
 #, c-format
@@ -2467,7 +2535,6 @@ 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
-#, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2480,12 +2547,12 @@ msgstr ""
 "\n"
 
 #: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
 #: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
@@ -2495,10 +2562,15 @@ msgid ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"Pros�m vlo�te hloubku d�v�ry (depth trust) k tomuto podpisu.\n"
+"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
 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
 #, c-format
@@ -2569,23 +2641,23 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %08lX\n"
+msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
 #: g10/keyedit.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" je ji� podeps�n kl��em %08lX\n"
+msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
 #: g10/keyedit.c:756
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
 #: g10/keyedit.c:778
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Nic k podeps�n� kl��em %08lX\n"
+msgstr "Nic k podeps�n� kl��em %s\n"
 
 #: g10/keyedit.c:793
 msgid "This key has expired!"
@@ -2642,80 +2714,56 @@ 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
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro detailn�j�� informace stiskn�t� '?'):"
 
 #: g10/keyedit.c:918
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
-"sv�m kl��em: \""
+"sv�m kl��em \"%s\" (%s)\n"
 
 #: g10/keyedit.c:925
-#, fuzzy
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"Jedn� se o podpis kl��e j�m sam�m\n"
+msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
 #: g10/keyedit.c:931
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
+msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
 #: g10/keyedit.c:939
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
+msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
 #: g10/keyedit.c:949
-#, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"Podpis bude ozna�en jako neexportovateln�.\n"
+msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
 #: g10/keyedit.c:956
-#, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
+msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
 #: g10/keyedit.c:963
-#, fuzzy
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"Nijak jsem tento kl�� neov��il.\n"
+msgstr "Nijak jsem tento kl�� neov��il.\n"
 
 #: g10/keyedit.c:968
-#, fuzzy
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"��ste�n� jsem ov��il tento kl��.\n"
+msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
 #: g10/keyedit.c:973
-#, fuzzy
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"Velmi pe�liv� jsem ov��il tento kl��.\n"
+msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
 #: g10/keyedit.c:983
-#, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "Skute�n� podepsat? "
+msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2746,7 +2794,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
@@ -2759,9 +2807,8 @@ msgstr ""
 "\n"
 
 #: g10/keyedit.c:1135
-#, fuzzy
 msgid "Do you really want to do this? (y/N) "
-msgstr "Opravdu to chcete ud�lat? "
+msgstr "Opravdu to chcete ud�lat? (a/N) "
 
 #: g10/keyedit.c:1201
 msgid "moving a key signature to the correct place\n"
@@ -2828,14 +2875,12 @@ msgid "s"
 msgstr "s"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "tsign"
-msgstr "sign"
+msgstr "tsign"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "make a trust signature"
-msgstr "vytvo�it podpis odd�len� od dokumentu"
+msgstr "vytvo�it trust signature"
 
 #: g10/keyedit.c:1260
 msgid "lsign"
@@ -2898,21 +2943,20 @@ msgid "add a secondary key"
 msgstr "p�idat sekund�rn� kl��"
 
 #: g10/keyedit.c:1271
-#, fuzzy
 msgid "addcardkey"
-msgstr "addkey"
+msgstr "addcardkey"
 
 #: g10/keyedit.c:1271
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "p�idat kl�� na kartu"
 
 #: g10/keyedit.c:1272
 msgid "keytocard"
-msgstr ""
+msgstr "keytocard"
 
 #: g10/keyedit.c:1272
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "p�esunout kl�� na kartu"
 
 #: g10/keyedit.c:1274
 msgid "delkey"
@@ -2999,14 +3043,12 @@ msgid "updated preferences"
 msgstr "aktualizovat p�edvolby"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "keyserver"
-msgstr "chyba serveru kl���"
+msgstr "keyserver"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "set preferred keyserver URL"
-msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
+msgstr "nastavit URL pro preferovan� server kl���"
 
 #: g10/keyedit.c:1287
 msgid "change the passphrase"
@@ -3069,9 +3111,9 @@ msgid "show photo ID"
 msgstr "uk�zat fotografick� ID"
 
 #: g10/keyedit.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "chyba p�i �ten� bloku tajn�ho kl��e `%s': %s\n"
+msgstr "chyba p�i �ten� bloku tajn�ho kl��e \"%s\": %s\n"
 
 #: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
@@ -3090,9 +3132,8 @@ msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
 #: g10/keyedit.c:1500
-#, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Opravdu podepsat v�echny id u�ivatele? "
+msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
 #: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
@@ -3112,88 +3153,75 @@ msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
 #: g10/keyedit.c:1553
-#, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
+msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
 #: g10/keyedit.c:1554
-#, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "Opravdu odstranit tento id u�ivatele? "
+msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
 #: g10/keyedit.c:1604
-#, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "Opravdu odstranit tento id u�ivatele? "
+msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
 #: g10/keyedit.c:1616
-#, fuzzy
 msgid "You must select exactly one key.\n"
-msgstr "Mus�te vybrat alespo� jeden kl��.\n"
+msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
 #: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
 #: g10/keyedit.c:1639
-#, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Opravdu chcete smazat vybran� kl��e? "
+msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
 #: g10/keyedit.c:1640
-#, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Opravdu chcete smazat tento kl��? "
+msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
 #: g10/keyedit.c:1675
-#, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
+msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
 #: g10/keyedit.c:1676
-#, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "Opravdu odstranit tento id u�ivatele? "
+msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
 #: g10/keyedit.c:1695
-#, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "Opravdu chcete revokovat vybran� kl��e? "
+msgstr "Opravdu chcete revokovat vybran� kl��e? (a/N) "
 
 #: g10/keyedit.c:1696
-#, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
-msgstr "Opravdu chcete revokovat tento kl��? "
+msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
 
 #: g10/keyedit.c:1735
 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:1767
-#, fuzzy
 msgid "Set preference list to:\n"
-msgstr "nastavit seznam p�edvoleb"
+msgstr "Nastavit seznam p�edvoleb:\n"
 
 #: g10/keyedit.c:1773
-#, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? "
+msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
 #: g10/keyedit.c:1775
-#, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "Opravdu aktualizovat p�edvolby? "
+msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
 #: g10/keyedit.c:1825
-#, fuzzy
 msgid "Save changes? (y/N) "
-msgstr "Ulo�it zm�ny? "
+msgstr "Ulo�it zm�ny? (a/N) "
 
 #: g10/keyedit.c:1828
-#, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "Ukon�it bez ulo�en�? "
+msgstr "Ukon�it bez ulo�en�? (a/N) "
 
 #: g10/keyedit.c:1838
 #, c-format
@@ -3219,89 +3247,73 @@ msgstr "Vlastnosti: "
 
 #: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Keyserver bez modifikace"
 
 #: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
-#, fuzzy, c-format
+#, c-format
 msgid "created: %s"
-msgstr "%s: nemohu vytvo�it: %s\n"
+msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#, c-format
 msgid "revoked: %s"
-msgstr "[revokov�n] "
+msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
-#, fuzzy, c-format
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#, c-format
 msgid "expired: %s"
-msgstr " [platnost skon��: %s]"
+msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
+#, c-format
 msgid "expires: %s"
-msgstr " [platnost skon��: %s]"
+msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2270
-#, fuzzy, c-format
+#: g10/keyedit.c:2276
+#, c-format
 msgid "usage: %s"
-msgstr "d�v�ra: %c/%c"
+msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2285
-#, fuzzy, c-format
+#: g10/keyedit.c:2291
+#, c-format
 msgid "trust: %s"
-msgstr "d�v�ra: %c/%c"
+msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "platnost: %s"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revokov�n] "
+msgstr "��slo karty: "
 
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3309,7 +3321,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+msgid "revoked"
+msgstr "revokov�n"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+msgid "expired"
+msgstr "platnost skon�ila"
+
+#: g10/keyedit.c:2536
 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"
@@ -3317,7 +3339,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3326,45 +3348,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3373,189 +3395,180 @@ 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:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
-#, fuzzy
+#: g10/keyedit.c:2965
 msgid "this key has already been designated as a revoker\n"
-msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
+msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 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:2993
-#, fuzzy
+#: g10/keyedit.c:2990
 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): "
+msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 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:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
-#, fuzzy, c-format
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:3498
-#, fuzzy
+#: g10/keyedit.c:3495
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
+msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:3499
-#, fuzzy
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
+msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
 
-#: g10/keyedit.c:3724
-#, fuzzy, c-format
+#: g10/keyedit.c:3721
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "id u�ivatele: \""
+msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
-#, fuzzy, c-format
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   podeps�no %08lX v %s%s%s\n"
+msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
-#, fuzzy, c-format
+#: g10/keyedit.c:3765
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
+msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:3794
-#, fuzzy
+#: g10/keyedit.c:3791
 msgid " (non-revocable)"
-msgstr " (neexportovateln�)"
+msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:3801
-#, fuzzy, c-format
+#: g10/keyedit.c:3798
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   revokov�no %08lX v %s\n"
+msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
-#, fuzzy, c-format
+#: g10/keyedit.c:4126
+#, 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�� 0x%08lX (uid %d)\n"
+msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
 
 #: g10/keygen.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "duplicita p�edvolby %c%lu\n"
+msgstr "duplicita p�edvolby `%s'\n"
 
 #: g10/keygen.c:300
-#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "p��li� mnoho `%c' p�edvoleb\n"
+msgstr "p��li� mnoho p�edvoleb pro �ifrov�n�\n"
 
 #: g10/keygen.c:302
-#, fuzzy
 msgid "too many digest preferences\n"
-msgstr "p��li� mnoho `%c' p�edvoleb\n"
+msgstr "p��li� mnoho p�edvoleb pro vzorkov�n�\n"
 
 #: g10/keygen.c:304
-#, fuzzy
 msgid "too many compression preferences\n"
-msgstr "p��li� mnoho `%c' p�edvoleb\n"
+msgstr "p��li� mnoho p�edvoleb pro komprimaci\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "neplatn� znak v �et�zci s p�edvolbami\n"
+msgstr "neplatn� polo�ka `%s' v �et�zci s p�edvolbami\n"
 
 #: g10/keygen.c:827
 msgid "writing direct signature\n"
@@ -3569,69 +3582,67 @@ msgstr "zapisuji podpis kl��e sebou sam�m\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
 
 #: g10/keygen.c:1247
-#, fuzzy
 msgid "Sign"
-msgstr "sign"
+msgstr "Podepisov�n�"
 
 #: g10/keygen.c:1250
-#, fuzzy
 msgid "Encrypt"
-msgstr "�ifrovat data"
+msgstr "�ifrov�n�"
 
 #: g10/keygen.c:1253
 msgid "Authenticate"
-msgstr ""
+msgstr "Autentizace"
 
 #: g10/keygen.c:1261
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsEeAaQq"
 
 #: g10/keygen.c:1276
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "Pro kl�� %s lze prov�st: "
 
 #: g10/keygen.c:1280
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Aktu�ln� povolen� akce: "
 
 #: g10/keygen.c:1285
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) Zapnout/vypnout schopnost podepisovat\n"
 
 #: g10/keygen.c:1288
-#, fuzzy, c-format
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
+msgstr "   (%c) Zapnout/vypnout schopnost �ifrovat\n"
 
 #: g10/keygen.c:1291
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 
 #: g10/keygen.c:1294
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Konec\n"
 
 #: g10/keygen.c:1348
 msgid "Please select what kind of key you want:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete:\n"
 
 #: g10/keygen.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
@@ -3642,93 +3653,60 @@ msgstr "   (%d) DSA (pouze pro podpis)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
+
+#: g10/keygen.c:1355
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1358
-#, fuzzy, c-format
-msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
-
-#: g10/keygen.c:1409
+#: g10/keygen.c:1360
 #, c-format
-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 ""
-"Chyst�m se vytvo�it nov� p�r kl��� %s.\n"
-"                       minim�ln� velikost kl��e je  768 bit�\n"
-"                      implicitn� velikost kl��e je 1024 bit�\n"
-"             nejvy��� navrhovan� velikost kl��e je 2048 bit�\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Jakou velikost kl��e si p�ejete? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "Kl�� DSA mus� m�t velikost od 512 do 1024 bit�.\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost pro RSA je 1024 "
-"bit�.\n"
+msgid "   (%d) RSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr ""
-"velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost je 768 bit�.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "velikost kl��e je p��li� velk�; maxim�ln� dovolen� hodnota je %d.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Velikosti kl��e v�t�� jak 2048 bit� se nedoporu�uj�, proto�e\n"
-"v�po�ty pak trvaj� VELMI dlouho!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Opravdu chcete vytvo�it kl�� t�to d�lky? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Jakou velikost kl��e si p�ejete? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Dob�e, ale nezapome�te, �e informace mohou b�t vyzrazeny z po��ta�e tak� "
-"elektromagnetick�m vyza�ov�n�m monitoru nebo kl�vesnice!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�lka kl��e je %u bit�.\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3744,7 +3722,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:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3760,29 +3738,29 @@ 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:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platn� pro? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "platnost %s neskon��\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "platnost %s skon�� %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3790,13 +3768,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:1577
-#, fuzzy
+#: g10/keygen.c:1589
 msgid "Is this correct? (y/N) "
-msgstr "Je to spr�vn� (a/n)? "
+msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1620
-#, fuzzy
+#: g10/keygen.c:1632
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3812,44 +3788,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3860,29 +3836,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3890,12 +3866,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3907,7 +3883,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3920,54 +3896,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "P�r kl��� DSA bude dlouh� 1024 bit�.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
-#, fuzzy, c-format
+#: g10/keygen.c:2761 g10/keygen.c:2899
+#, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, 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:2927
+#: g10/keygen.c:2939
 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:2938
+#: g10/keygen.c:2950
 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"
@@ -3975,12 +3947,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3988,7 +3960,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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3996,43 +3968,42 @@ 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
-#, fuzzy
+#: g10/keygen.c:3052 g10/keygen.c:3174
 msgid "Really create? (y/N) "
-msgstr "Opravdu vytvo�it? "
+msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3315
-#, fuzzy, c-format
+#: g10/keygen.c:3327
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
+msgstr "ulo�en� kl��e na kartu se nezda�ilo: %s\n"
 
-#: g10/keygen.c:3362
-#, fuzzy, c-format
+#: g10/keygen.c:3374
+#, c-format
 msgid "can't create backup file `%s': %s\n"
-msgstr "nemohu vytvo�it `%s': %s\n"
+msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:3385
-#, fuzzy, c-format
+#: g10/keygen.c:3397
+#, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "POZN�MKA: platnost tajn�ho kl��e %08lX skon�ila %s\n"
+msgstr "POZN�MKA: z�loha kl��e z karty ulo�ena do `%s'\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "RSA modulus nen� dlouh� %d\n"
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "ve�ejn� RSA exponent je p��li� dlouh� (v�ce ne� 32 bit�)\n"
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgstr "d�lka RSA prvo��sla nen� %d\n"
 
 #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
 msgid "never     "
@@ -4048,7 +4019,7 @@ msgstr "Podepisovac� politika: "
 
 #: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Kriticky preferovan� keyserver: "
 
 #: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
@@ -4071,39 +4042,38 @@ msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
 #: g10/keylist.c:729
-#, fuzzy, c-format
+#, c-format
 msgid "expired: %s)"
-msgstr " [platnost skon��: %s]"
+msgstr "platnost skon�ila: %s)"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
-#, fuzzy
+#: g10/keylist.c:1440 g10/keylist.c:1444
 msgid "      Key fingerprint ="
-msgstr "   Fingerprint kl��e ="
+msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "      Seriov� ��slo karty ="
 
 #: g10/keyring.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
+msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4124,19 +4094,19 @@ msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
 #: g10/keyring.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "kontroluji soubor kl��� (keyring) `%s'\n"
+msgstr "cache souboru kl��� `%s'\n"
 
 #: g10/keyring.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
+msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
 #: g10/keyring.c:1433
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
+msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
 #: g10/keyring.c:1504
 #, c-format
@@ -4144,137 +4114,130 @@ msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
 #: g10/keyserver.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
-msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
+msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
 #: g10/keyserver.c:378
-#, fuzzy
 msgid "disabled"
-msgstr "disable"
+msgstr "disabled"
 
 #: g10/keyserver.c:579
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
 #: g10/keyserver.c:662 g10/keyserver.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "neplatn� parametr pro export\n"
+msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
 #: g10/keyserver.c:752
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "kl�� `%s' nenalezen: %s\n"
+msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
 #: g10/keyserver.c:754
-#, fuzzy
 msgid "key not found on keyserver\n"
-msgstr "kl�� `%s' nenalezen: %s\n"
+msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
 #: g10/keyserver.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "po�aduji kl�� %08lX z %s\n"
+msgstr "po�aduji kl�� %s ze %s server %s\n"
 
 #: g10/keyserver.c:900
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "po�aduji kl�� %08lX z %s\n"
+msgstr "po�aduji kl�� %s z %s\n"
 
 #: g10/keyserver.c:1045
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "vyhled�v�m \"%s\" na HKP serveru %s\n"
+msgstr "pos�l�m kl�� %s na %s server %s\n"
 
 #: g10/keyserver.c:1049
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"podeps�no Va��m kl��em %08lX v %s\n"
+msgstr "pos�l�m kl�� %s na %s\n"
 
 #: g10/keyserver.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "vyhled�v�m \"%s\" na HKP serveru %s\n"
+msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
 #: g10/keyserver.c:1095
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "vyhled�v�m \"%s\" na HKP serveru %s\n"
+msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
 #: g10/keyserver.c:1102 g10/keyserver.c:1197
-#, fuzzy
 msgid "no keyserver action!\n"
-msgstr "neplatn� parametr pro export\n"
+msgstr "��dn� operace se serverem kl���!\n"
 
 #: g10/keyserver.c:1150
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
+msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
 #: g10/keyserver.c:1159
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "server kl��� neposlal VERSION\n"
 
 #: g10/keyserver.c:1218
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
 #: g10/keyserver.c:1224
 msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
+msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
 #: g10/keyserver.c:1236
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
 #: g10/keyserver.c:1241
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
+msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
 #: g10/keyserver.c:1249
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgstr "gpgkeys_%s nepodporuje protokol verze  %d\n"
 
 #: g10/keyserver.c:1254
-#, fuzzy
 msgid "keyserver timed out\n"
-msgstr "chyba serveru kl���"
+msgstr "�asov� limit pro server kl��� vypr�el\n"
 
 #: g10/keyserver.c:1259
-#, fuzzy
 msgid "keyserver internal error\n"
-msgstr "chyba serveru kl���"
+msgstr "intern� chyba serveru kl���\n"
 
 #: g10/keyserver.c:1268
-#, fuzzy, c-format
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
+msgstr "chyba komunikace se serverem kl���: %s\n"
 
 #: g10/keyserver.c:1293 g10/keyserver.c:1327
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
 #: g10/keyserver.c:1578
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
+msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
 #: g10/keyserver.c:1600
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "po�aduji kl�� %08lX z %s\n"
+msgstr "aktualizuji 1 kl�� z %s\n"
 
 #: g10/keyserver.c:1602
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "po�aduji kl�� %08lX z %s\n"
+msgstr "aktualizuji %d kl��� z %s\n"
 
 #: g10/mainproc.c:248
 #, c-format
@@ -4292,35 +4255,35 @@ msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
+msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
 #: g10/mainproc.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "public key is %s\n"
-msgstr "ve�ejn� kl�� je %08lX\n"
+msgstr "ve�ejn� kl�� je %s\n"
 
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za�ifrov�na ve�ejn�m kl��em: spr�vn� DEK\n"
 
 #: g10/mainproc.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %08lX, vytvo�en�m %s\n"
+msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %s, vytvo�en�m %s\n"
 
 #: g10/mainproc.c:465 g10/pkclist.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                alias \""
+msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
 #: g10/mainproc.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "za�ifrov�no %s kl��em, ID %08lX\n"
+msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
 #: g10/mainproc.c:483
 #, c-format
@@ -4389,48 +4352,48 @@ msgid "can't handle these multiple signatures\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
 #: g10/mainproc.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s\n"
-msgstr "Platnost podpisu skon�ila %s\n"
+msgstr "Podpis vytvo�en %s\n"
 
 #: g10/mainproc.c:1351
-#, fuzzy, c-format
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                alias \""
+msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 #: g10/mainproc.c:1355
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Podpis vytvo�en %.*s pomoc� kl��e %s s ID u�ivatele %08lX\n"
+msgstr "Podpis vytvo�en %s pomoc� kl��e %s s ID u�ivatele %s\n"
 
 #: g10/mainproc.c:1375
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
 #: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "�PATN� podpis od \""
+msgstr "�PATN� podpis od \"%s\""
 
 #: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Podpis s vypr�enou platnost� od \""
+msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
 #: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Dobr� podpis od \""
+msgstr "Dobr� podpis od \"%s\""
 
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
-msgstr "[nejist�]  "
+msgstr "[nejist�]"
 
 #: g10/mainproc.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                alias \""
+msgstr "                alias \"%s\""
 
 #: g10/mainproc.c:1662
 #, c-format
@@ -4455,7 +4418,7 @@ msgstr "bin�rn� form�t"
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
@@ -4486,30 +4449,42 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nemohu vypnout vytv��en� core soubor�: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
-#, fuzzy, c-format
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "nelze otev��t soubor: %s\n"
+msgstr "fstat `%s' selhal na %s: %s\n"
 
-#: g10/misc.c:186
-#, fuzzy, c-format
+#: g10/misc.c:190
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "datab�ze d�v�ry: procedura read() (n=%d) selhala: %s\n"
+msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Experiment�ln� algoritmy by se nem�ly pou��vat!\n"
+#: g10/misc.c:299
+#, 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:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "�ifrovac� algoritmus nen� implementov�n"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "podpis %s, hashovac� algoritmus %s\n"
+
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"tento �ifrovac� algoritmus se nedoporu�uje; pros�m, pou�ijte n�jak� "
-"standardn�j��!\n"
+"VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
+"p��jemce\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4541,9 +4516,8 @@ msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #: g10/misc.c:706
-#, fuzzy
 msgid "uncompressed|none"
-msgstr "Nezakomprimov�no"
+msgstr "nezakomprimov�no|nic"
 
 #: g10/misc.c:816
 #, c-format
@@ -4551,14 +4525,14 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "�tu mo�nosti z `%s'\n"
+msgstr "nejednozna�n� volby `%s'\n"
 
 #: g10/misc.c:998
-#, fuzzy, c-format
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "nezn�m� implicitn� adres�t `%s'\n"
+msgstr "nezn�m� volba `%s'\n"
 
 #: g10/openfile.c:84
 #, c-format
@@ -4566,7 +4540,6 @@ msgid "File `%s' exists. "
 msgstr "Soubor `%s' existuje. "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "P�epsat (a/N)? "
 
@@ -4599,9 +4572,9 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 
 #: g10/openfile.c:409
-#, fuzzy, c-format
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: adres�� vytvo�en\n"
+msgstr "adres�� `%s' vytvo�en\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -4617,51 +4590,51 @@ msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "nemohu nastavit PID klienta pro gpg-agenta\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "nelze z�skat server read file descriptor pro agenta r\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "nezle z�skat server write file descriptor pro agenta\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunikaci s gpg-agentem\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
-#, fuzzy, c-format
+#: g10/passphrase.c:698 g10/passphrase.c:1203
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (hlavn� ID kl��e %08lX)"
+msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:698
-#, fuzzy, c-format
+#: g10/passphrase.c:712
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
@@ -4669,63 +4642,62 @@ msgid ""
 msgstr ""
 "Pot�ebujete heslo, abyste odemknul(a) tajn� kl�� pro u�ivatele:\n"
 "\"%.*s\"\n"
-"Kl�� o d�lce %u bit�, typ %s, ID %08lX, vytvo�en� %s%s\n"
+"Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "heslo je p��li� dlouh�\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakce od agenta\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1141
-#, fuzzy, c-format
+#: g10/passphrase.c:1184
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
-"u�ivatele: \""
+"u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:1147
-#, fuzzy, c-format
+#: g10/passphrase.c:1190
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "d�lka %u bit�, typ %s, kl�� %08lX, vytvo�en� %s"
+msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -4748,24 +4720,23 @@ msgid "Enter JPEG filename for photo ID: "
 msgstr "Vlo�te jm�no JPEG souboru s fotografick�m ID: "
 
 #: g10/photoid.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "nelze otev��t soubor: %s\n"
+msgstr "nelze otev��t JPEG soubor `%s': %s\n"
 
 #: g10/photoid.c:102
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "Tento JPEG je opravdu velk� (%d bajt�)!\n"
 
 #: g10/photoid.c:104
-#, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
+msgstr "Jste si jist�(�), �e jej chcete pou��t? (a/N) "
 
 #: g10/photoid.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "\"%s\" nen� soubor ve form�tu JPEG\n"
+msgstr "`%s' nen� soubor ve form�tu JPEG\n"
 
 #: g10/photoid.c:136
 msgid "Is this photo correct (y/N/q)? "
@@ -4808,50 +4779,43 @@ msgid "iImMqQsS"
 msgstr "iImMuUsS"
 
 #: g10/pkclist.c:213
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"K nen� p�i�azena ��dn� hodnota d�v�ry:\n"
-"%4u%c/%08lX %s \""
+msgstr "Nen� p�i�azena ��dn� hodnota d�v�ry:\n"
 
 #: g10/pkclist.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                alias \""
+msgstr "  alias \"%s\"\n"
 
 #: g10/pkclist.c:255
-#, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Tento kl�� pravd�podobn� n�le�� jeho majiteli\n"
+msgstr "Nakolik d�v��ujete tvrzen�, �e tento kl�� pat�� uveden�mu u�ivateli?\n"
 
 #: g10/pkclist.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = Nev�m\n"
+msgstr " %d = Nev�m nebo ne�eknu\n"
 
 #: g10/pkclist.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
 msgstr " %d = Ned�v��uji\n"
 
 #: g10/pkclist.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
 msgstr " %d = D�v��uji absolutn�\n"
 
 #: g10/pkclist.c:284
-#, fuzzy
 msgid "  m = back to the main menu\n"
 msgstr " m = zp�t do hlavn�ho menu\n"
 
 #: g10/pkclist.c:287
-#, fuzzy
 msgid "  s = skip this key\n"
 msgstr " s = p�esko�it tento kl��\n"
 
 #: g10/pkclist.c:288
-#, fuzzy
 msgid "  q = quit\n"
 msgstr " u = ukon�it\n"
 
@@ -4861,43 +4825,40 @@ msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
+"\n"
 
 #: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
 #: g10/pkclist.c:319
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? "
+msgstr "Opravdu chcete nastavit pro tento kl�� absolutn� d�v�ru? (a/N) "
 
 #: g10/pkclist.c:333
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certifik�ty vedouc� k fin�ln�mu d�v�ryhodn�mu kl��i:\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: Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
+msgstr "%s: Nic nenazna�uje tomu, �e tento kl�� pat�� uveden�mu u�ivateli\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: Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
+msgstr "%s: Je zde ��ste�n� d�v�ra, �e tento kl�� pat�� uveden�mu uv�ivateli\n"
 
 #: g10/pkclist.c:429
-#, fuzzy
 msgid "This key probably belongs to the named user\n"
-msgstr "Tento kl�� pravd�podobn� n�le�� jeho majiteli\n"
+msgstr "Tento kl�� pravd�podobn� n�le�� uveden�mu u�ivateli\n"
 
 #: g10/pkclist.c:434
 msgid "This key belongs to us\n"
 msgstr "Tento kl�� n�le�� n�m (m�me odpov�daj�c� tajn� kl��)\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"
@@ -4909,9 +4870,8 @@ msgstr ""
 "\n"
 
 #: g10/pkclist.c:467
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "Pou��t p�esto tento kl��? "
+msgstr "Pou��t p�esto tento kl��? (a/N) "
 
 #: g10/pkclist.c:501
 msgid "WARNING: Using untrusted key!\n"
@@ -4930,7 +4890,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n sv�m vlastn�kem!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamenat, �e podpis je pad�lan�.\n"
 
 #: g10/pkclist.c:527
@@ -4990,7 +4951,7 @@ msgstr ""
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Aktu�ln� p��jemci:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -5017,9 +4978,9 @@ msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
 #: g10/pkclist.c:903
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "nezn�m� implicitn� adres�t `%s'\n"
+msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
 #: g10/pkclist.c:948
 #, c-format
@@ -5036,36 +4997,36 @@ msgstr ""
 "data nebyla ulo�ena; k jejich ulo�en� pou�ijte parametr p��kazu \"--output"
 "\"\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
 #: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "anonymn� adres�t; zkou��m tajn� kl�� %08lX ...\n"
+msgstr "anonymn� adres�t; zkou��m tajn� kl�� %s ...\n"
 
 #: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
@@ -5081,14 +5042,14 @@ msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je nezn�m� nebo je zneplatn�n\n"
 
 #: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
-msgstr "POZN�MKA: v p�edvolb�ch nenalezen �ifrovac� algoritmus %d\n"
+msgstr "VAROV�N�: v p�edvolb�ch p��jemce nenalezen �ifrovac� algoritmus %s\n"
 
 #: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "POZN�MKA: platnost tajn�ho kl��e %08lX skon�ila %s\n"
+msgstr "POZN�MKA: platnost tajn�ho kl��e %s skon�ila %s\n"
 
 #: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
@@ -5101,9 +5062,9 @@ msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
 
 #: g10/revoke.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "kl�� %08lX: chyb� identifik�tor u�ivatele\n"
+msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
 #: g10/revoke.c:272
 msgid "To be revoked by:\n"
@@ -5114,9 +5075,8 @@ msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� kl��)\n"
 
 #: g10/revoke.c:280
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? "
+msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
@@ -5132,14 +5092,14 @@ msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
 #: g10/revoke.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "pro `%s' nebyl nalezen ��dn� revoka�n� kl��\n"
+msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
 #: g10/revoke.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "tajn� kl�� `%s' nenalezen: %s\n"
+msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
 #: g10/revoke.c:461
 #, c-format
@@ -5151,9 +5111,8 @@ msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
 #: g10/revoke.c:479
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? "
+msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
 #: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
@@ -5209,9 +5168,8 @@ msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
 #: g10/revoke.c:680
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "Je d�vod revokace vybr�n spr�vn�? "
+msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
 #: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
@@ -5223,9 +5181,9 @@ msgid "protection algorithm %d%s is not supported\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
 #: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
+msgstr "ochrann� algoritmus %d nen� podporov�n\n"
 
 #: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
@@ -5266,63 +5224,62 @@ msgid "WARNING: signature digest conflict in message\n"
 msgstr "VAROV�N�: konflikt hashe podpisu ve zpr�v�\n"
 
 #: g10/sig-check.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "VAROV�N�: podepisovac� podkl�� %08lX nen� k���ov� certifikov�n\n"
+msgstr "VAROV�N�: podepisovac� podkl�� %s nen� k���ov� certifikov�n\n"
 
 #: g10/sig-check.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
-msgstr ""
-"VAROV�N�: podepisovac� podkl�� %08lX m� neplatnou k���ovou certifikaci\n"
+msgstr "VAROV�N�: podepisovac� podkl�� %s m� neplatnou k���ovou certifikaci\n"
 
 #: g10/sig-check.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr "ve�ejn� kl�� %08lX je o %lu sekund nov�j�� ne� podpis\n"
+msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\n"
 
 #: g10/sig-check.c:169
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr "ve�ejn� kl�� %08lX je o %lu sekund nov�j�� ne� podpis\n"
+msgstr "ve�ejn� kl�� %s je o %lu sekund nov�j�� ne� podpis\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 ""
-"kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
+"kl�� %s 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/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 ""
-"kl�� byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu nebo\n"
+"kl�� %s 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/sig-check.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "POZN�MKA: podpisov�mu kl��i %08lX skon�ila platnost %s\n"
+msgstr "POZN�MKA: podpisov�mu kl��i %s skon�ila platnost %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 ""
-"p�edpokl�d�m �patn� podpis kl��em %08lX, proto�e je nastaven nezn�m� "
-"kritick� bit\n"
+"p�edpokl�d�m �patn� podpis kl��em %s, proto�e je nastaven nezn�m� kritick� "
+"bit\n"
 
 #: g10/sig-check.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "kl�� %08lX: neexistuje podkl�� pro revokaci podkl��e\n"
+msgstr "kl�� %s: neexistuje podkl�� pro revokaci podkl��e\n"
 
 #: g10/sig-check.c:558
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "kl�� %08lX: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
+msgstr "kl�� %s: podkl�� kter� je sv�z�n s podpisem neexistuje\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -5349,7 +5306,7 @@ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "nelze ulo�it URL politiky do podpisu v3 kl��em (form�t 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 ""
@@ -5357,13 +5314,13 @@ msgstr ""
 "neexpandovan�.\n"
 
 #: g10/sign.c:187
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"VAROV�N�: nemohu %%-expandovat URL politiky (p��li� dlouh�). Pou�ity "
-"neexpandovan�.\n"
+"VAROV�N�: nemohu %%-expandovat URL preferovan�ho keyservery (p��li� dlouh�). "
+"Pou�ity neexpandovan�.\n"
 
 #: g10/sign.c:364
 #, c-format
@@ -5371,9 +5328,9 @@ msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 
 #: g10/sign.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s podpis od: \"%s\"\n"
+msgstr "%s/%s podpis od: \"%s\"\n"
 
 #: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
@@ -5381,57 +5338,53 @@ msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "zapisuji do '%s'\n"
-
-#: g10/sign.c:807
-#, fuzzy, c-format
+#: g10/sign.c:808
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
+msgstr ""
+"VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
+"p��jemce\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "kl�� nen� ozna�en jako nedostate�n� bezpe�n� - nemohu jej pou��t s pad�lan�m "
 "RNG!\n"
 
-#: g10/skclist.c:158
-#, fuzzy, c-format
+#: g10/skclist.c:157
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "p�esko�en `%s': duplikov�n\n"
+msgstr "p�esko�en \"%s\": duplikov�n\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
-#, fuzzy, c-format
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "p�esko�en `%s': %s\n"
+msgstr "p�esko�en \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:186
-#, fuzzy
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"p�esko�en `%s': toto je vygenerovan� PGP kl�� podle algoritmu ElGamal,\n"
-"podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!\n"
+"toto je PGP kl�� vygenerovan� podle algoritmu ElGamal,\n"
+"podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!"
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
 #, c-format
@@ -5448,40 +5401,37 @@ msgstr ""
 "# (Pou�ijte \"gpg --import-ownertrust\" k jeho obnov�)\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 "chyba p�i �ten� `%s': %s\n"
+msgstr "chyba v `%s': %s\n"
 
 #: g10/tdbdump.c:159
-#, fuzzy
 msgid "line too long"
-msgstr "��dek je p��li� dlouh�\n"
+msgstr "��dek je p��li� dlouh�"
 
 #: g10/tdbdump.c:167
 msgid "colon missing"
-msgstr ""
+msgstr "sloupec sch�z�"
 
 #: g10/tdbdump.c:173
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "chyba: neplatn� fingerprint\n"
+msgstr "neplatn� fingerprint"
 
 #: g10/tdbdump.c:178
-#, fuzzy
 msgid "ownertrust value missing"
 msgstr ""
-"importovat hodnoty d�v�ryhodnosti\n"
+"hodnota d�v�ryhodnosti vlastn�ka sch�z�importovat hodnoty d�v�ryhodnosti\n"
 " vlastn�ka kl��e"
 
 #: g10/tdbdump.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti: %s\n"
+msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
 #: g10/tdbdump.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "chyba p�i �ten�: %s\n"
+msgstr "chyba p�i �ten� v `%s': %s\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
@@ -5503,9 +5453,9 @@ msgid "trustdb transaction too large\n"
 msgstr "transakce s datab�z� d�v�ry je p��li� dlouh�\n"
 
 #: g10/tdbio.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "nemohu zav��t `%s': %s\n"
+msgstr "nemohu otev��t `%s': %s\n"
 
 #: g10/tdbio.c:512
 #, c-format
@@ -5513,14 +5463,14 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: adres�� neexistuje!\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 "nemohu vytvo�it `%s': %s\n"
+msgstr "nemohu vytvo�it z�mek pro  `%s'\n"
 
 #: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "nelze otev��t `%s'\n"
+msgstr "nelze zam��t `%s'\n"
 
 #: g10/tdbio.c:550
 #, c-format
@@ -5616,12 +5566,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� ��dek je del�� ne� %d znak�\n"
@@ -5632,25 +5582,24 @@ msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' nen� platn� dlouh� keyID\n"
 
 #: g10/trustdb.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "kl�� %08lX: akceptov�n jako d�v�ryhodn� kl��\n"
+msgstr "kl�� %s: akceptov�n jako d�v�ryhodn� kl��\n"
 
 #: g10/trustdb.c:295
-#, fuzzy, c-format
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "kl�� %08lX se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
+msgstr "kl�� %s se v datab�zi d�v�ry vyskytuje v�ce ne� jednou\n"
 
 #: g10/trustdb.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr ""
-"kl�� %08lX: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
+msgstr "kl�� %s: nenalezen ve�ejn� kl�� k d�v�ryhodn�mu kl��i - p�esko�eno\n"
 
 #: g10/trustdb.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "kl�� ozna�en jako absolutn� d�v�ryhodn�.\n"
+msgstr "kl�� %s ozna�en jako absolutn� d�v�ryhodn�.\n"
 
 #: g10/trustdb.c:344
 #, c-format
@@ -5666,94 +5615,133 @@ msgstr "z�znam d�v�ry %lu nen� po�adovan�ho typu %d\n"
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
+"nelze pou��t nezn�m� model d�v�ry (%d) - p�edpokl�d�me pou�it� modelu %s\n"
 
 #: g10/trustdb.c:452
 #, c-format
 msgid "using %s trust model\n"
+msgstr "poui�it� modelu d�v�ry %s\n"
+
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:501
-msgid "undefined"
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "revokov�n"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "platnost skon�ila"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "nezn�m� form�t"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+#, fuzzy
+msgid "[marginal]"
+msgstr "��ste�n�"
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:515
 #, fuzzy
+msgid "[ultimate]"
+msgstr "absolutn�"
+
+#: g10/trustdb.c:530
+msgid "undefined"
+msgstr "nedefinov�n"
+
+#: g10/trustdb.c:531
 msgid "never"
-msgstr "nikdy     "
+msgstr "��dn�"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
-msgstr ""
+msgstr "��ste�n�"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
-msgstr ""
+msgstr "pln�"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
-msgstr ""
+msgstr "absolutn�"
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:560
-#, fuzzy, c-format
+#: g10/trustdb.c:589
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
+msgstr "nen� nutn� kontrolovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:575
-#, fuzzy, c-format
+#: g10/trustdb.c:604
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
+msgstr "nen� nutn� aktualizovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
-#, fuzzy, c-format
+#: g10/trustdb.c:822 g10/trustdb.c:1260
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "ve�ejn� kl�� %08lX nebyl nalezen: %s\n"
+msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:1934
-#, fuzzy, c-format
+#: g10/trustdb.c:1963
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i  %08lX nebyl nalezen\n"
+msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
+"df, %du\n"
 
-#: g10/trustdb.c:2118
-#, fuzzy, c-format
+#: g10/trustdb.c:2147
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "z�znam d�v�ry %lu, typ %d: z�pis selhal: %s\n"
+msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
 
 #: g10/verify.c:116
 msgid ""
@@ -5979,22 +5967,20 @@ msgid "keyserver error"
 msgstr "chyba serveru kl���"
 
 #: util/errors.c:108
-#, fuzzy
 msgid "canceled"
-msgstr "Zru�it"
+msgstr "zru�eno"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "neza�ifrov�no"
+msgstr "��dn� karta"
 
 #: util/logger.c:157
 msgid "ERROR: "
-msgstr ""
+msgstr "CHYBA: "
 
 #: util/logger.c:160
 msgid "WARNING: "
-msgstr ""
+msgstr "VAROV�N�: "
 
 #: util/logger.c:223
 #, c-format
@@ -6028,20 +6014,19 @@ msgstr "uUqQ"
 
 #: util/miscutil.c:384
 msgid "okay|okay"
-msgstr ""
+msgstr "okey|okey"
 
 #: util/miscutil.c:386
 msgid "cancel|cancel"
-msgstr ""
+msgstr "zru�it|zru�it"
 
 #: util/miscutil.c:387
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #: util/miscutil.c:388
-#, fuzzy
 msgid "cC"
-msgstr "c"
+msgstr "zZ"
 
 #: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
@@ -6059,462 +6044,63 @@ 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 "sorry, can't do this in batch mode\n"
-#~ msgstr "nelze prov�st v d�vkov�m m�du\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "kl�� `%s' nenalezen: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "nemohu vytvo�it `%s': %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "nelze otev��t soubor: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                alias \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = pros�m o v�ce informac�\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "kl�� %08lX: kl�� byl revokov�n\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "kl�� %08lX: podkl�� byl revokov�n!\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: skon�ila platnost kl��e\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: NEd�v��ujeme tomuto kl��i!\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (pouze pro podpis)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (pro �ifrov�n� a podpis)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: nemohu otev��t: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: VAROV�N�: soubor je pr�zdn�\n"
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "hashovac� algoritmus `%s' je v tomto release read-only\n"
 
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "nelze otev��t %s: %s\n"
+#~ msgid "[%8.8s] "
+#~ msgstr "[%8.8s]"
 
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = D�v��uji ��ste�n�\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = D�v��uji �pln�\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
 #~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
+#~ "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 ""
-#~ "\"\n"
-#~ "lok�ln� podeps�no Va��m kl��em %08lX v %s\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   podeps�no %08lX v %s%s\n"
+#~ "Chyst�m se vytvo�it nov� p�r kl��� %s.\n"
+#~ "                       minim�ln� velikost kl��e je  768 bit�\n"
+#~ "                      implicitn� velikost kl��e je 1024 bit�\n"
+#~ "             nejvy��� navrhovan� velikost kl��e je 2048 bit�\n"
 
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: nemohu p�istoupit k: %s\n"
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "Kl�� DSA mus� m�t velikost od 512 do 1024 bit�.\n"
 
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: nemohu vytvo�it z�mek\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: nemohu zamknout\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: nemohu vytvo�it: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: nemohu vytvo�it adres��: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 #~ msgstr ""
-#~ "Pokud p�esto chcete pou��t tento revokovan� kl��, odpov�zte \"ano\"."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Nelze otev��t fotografii \"%s\": %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "nelze otev��t soubor: %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "chyba: sch�z� sloupec\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "chyba: sch�z� hodnota d�v�ryhodnosti\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (hlavn� ID kl��e %08lX)"
+#~ "velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost pro RSA je "
+#~ "1024 bit�.\n"
 
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! podkl�� byl revokov�n: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- nalezena pad�lan� revokace\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? probl�m ov��en� revokace: %s\n"
-
-#~ msgid "[revoked] "
-#~ msgstr "[revokov�n] "
-
-#~ msgid "[expired] "
-#~ msgstr "[expirov�n] "
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [platnost skon��: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [platnost skon��: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[revokov�n] "
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "%s: nemohu vytvo�it: %s\n"
-
-#~ msgid ""
-#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
-#~ msgstr ""
-#~ "VAROV�N�: hash `%s' nen� sou��st� definice OpenPGP.  Pou�it� na vlastn� "
-#~ "nebezpe��!\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[soubor]|�ifrovat soubor"
-
-#~ msgid "store only"
-#~ msgstr "pouze ulo�en�"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[soubor]|de�ifrovat soubor"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "podepsat kl�� bez mo�nosti revokace podpisu"
-
-#~ msgid "sign a key locally and non-revocably"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
 #~ msgstr ""
-#~ "podepsat kl�� lok�ln� a bez mo�nosti\n"
-#~ " revokace podpisu"
+#~ "velikost kl��e je p��li� mal�; minim�ln� dovolen� velikost je 768 bit�.\n"
 
-#~ msgid "list only the sequence of packets"
-#~ msgstr "vypsat pouze po�ad� paket�"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr ""
-#~ "exportovat hodnoty d�v�ryhodnosti\n"
-#~ " vlastn�ka kl��e"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "neinteraktivn� aktualizace datab�ze d�v�ry"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "opravit naru�enou datab�zi d�v�ry"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr "Dek�dovat ASCII soubor nebo std. vstup"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "Zak�dovat soubor nebo std. vstup do ASCII"
-
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|JM�NO|pou��t JM�NO jako implicitn�ho adres�ta"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr ""
-#~ "pou��t implicitn� kl�� jako implicitn�ho\n"
-#~ " adres�ta"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "v�bec nepou��vat termin�l"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "vynutit podpisy verze 3"
-
-#~ msgid "do not force v3 signatures"
-#~ msgstr "nevynucovat podpisy verze 3"
-
-#~ msgid "force v4 key signatures"
-#~ msgstr "vynutit podpisy verze 4"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "nevynucovat podpisy verze 4"
-
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "pro �ifrov�n� v�dy pou��t MDC"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr "pro �ifrov�n� nikdy nepou��t MDC"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "pou�ijte gpg-agenta"
-
-#~ msgid "batch mode: never ask"
-#~ msgstr "d�vkov� re�im: nikdy se na nic neptat"
-
-#~ msgid "assume yes on most questions"
-#~ msgstr "automaticky odpov�d�t ANO na v�t�inu ot�zek"
-
-#~ msgid "assume no on most questions"
-#~ msgstr "automaticky odpov�d�t NE na v�t�inu ot�zek"
-
-#~ msgid "add this keyring to the list of keyrings"
-#~ msgstr ""
-#~ "p�idat tento soubor kl��� do seznamu\n"
-#~ " pou��van�ch soubor� kl���"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "p�idat tento soubor tajn�ch kl��� do seznamu"
-
-#~ msgid "show which keyring a listed key is on"
-#~ msgstr "uka� ve kter�m souboru kl��� je vypsan� kl��"
-
-#~ msgid "|NAME|use NAME as default secret key"
-#~ msgstr "|JM�NO|pou�ij JM�NO jako implicitn� tajn� kl��"
-
-#~ msgid "|HOST|use this keyserver to lookup keys"
-#~ msgstr ""
-#~ "|PO��TA�|pou�ij tento server kl��� pro vyhled�v�n�\n"
-#~ " kl���"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr "|JM�NO|nastav znakovou sadu termin�lu na JM�NO"
-
-#~ msgid "read options from file"
-#~ msgstr "��st nastaven� ze souboru"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr "|[SOUBOR]|zapi� informaci o stavu do SOUBORu"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|KL��|�pln� d�v��ovat tomuto kl��i"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr "|SOUBOR|nahr�t roz�i�uj�c� modul SOUBOR"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr "emulovat m�d popsan� v RFC1991"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr ""
-#~ "nastav v�echny vlastnosti paket�, �ifer\n"
-#~ " a hash� jako v OpenPGP"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr ""
-#~ "nastav v�echny vlastnosti paket�, �ifer\n"
-#~ " a hash� jako v PGP 2.x"
-
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|pou��t m�d hesla N"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|ALG|pou��t hashovac� algoritmus ALG pro hesla"
-
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|ALG|pou��t �ifrovac� algoritmus ALG pro hesla"
-
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr "|ALG|pou��t �ifrovac� algoritmus ALG"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr "|ALG|pou��t hashovac� algoritmus ALG"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|pou��t komprima�n� algoritmus N"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "zahodit identifik�tor kl��e z �ifrovan�ch paket�"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "Zobrazit fotografick� ID"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "Nezobrazovat fotografick� ID"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr "Nastavit p��kazov� ��dek k prohl��en� fotografick�ho ID"
-
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
-#~ msgstr "komprima�n� algoritmus `%s' je v tomto release read-only\n"
-
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr "komprima�n� algoritmus mus� b�t v rozmez� %d..%d\n"
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "velikost kl��e je p��li� velk�; maxim�ln� dovolen� hodnota je %d.\n"
 
 #~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
 #~ msgstr ""
-#~ "%08lX: Nen� jist�, zda tento podpis pat�� vlastn�kovi, p�esto je "
-#~ "akceptov�n\n"
-
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "p�edvolba %c%lu nen� platn�\n"
+#~ "Velikosti kl��e v�t�� jak 2048 bit� se nedoporu�uj�, proto�e\n"
+#~ "v�po�ty pak trvaj� VELMI dlouho!\n"
 
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "kl�� %08lX: nen� ve form�tu RFC 2440 - p�esko�eno\n"
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Opravdu chcete vytvo�it kl�� t�to d�lky? (a/N) "
 
 #~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
 #~ msgstr ""
-#~ "POZN�MKA: detekov�n prim�rn� kl�� Elgamal - import m��e chvilku trvat\n"
-
-#~ msgid " (default)"
-#~ msgstr " (implicitn�)"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  vytvo�en: %s platnost skon��: %s"
+#~ "Dob�e, ale nezapome�te, �e informace mohou b�t vyzrazeny z po��ta�e tak� "
+#~ "elektromagnetick�m vyza�ov�n�m monitoru nebo kl�vesnice!\n"
 
-#~ msgid "Notation: "
-#~ msgstr "Notace: "
-
-#~ msgid "Policy: "
-#~ msgstr "Politika: "
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "nemohu dostat kl�� ze serveru kl���: %s\n"
-
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "chyba p�i pos�l�n� na `%s': %s\n"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "�sp�n� odesl�n� na `%s' (status=%u)\n"
-
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "chyba odesl�n� na `%s': (status=%u)\n"
-
-#~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "tento keyserver nepodporuje --search-keys\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "nemohu prohled�vat server kl���: %s\n"
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Experiment�ln� algoritmy by se nem�ly pou��vat!\n"
 
 #~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
 #~ msgstr ""
-#~ "kl�� %08lX: toto je kl�� algoritmu ElGamal vygenerovan� v PGP - podpisy "
-#~ "j�m vytvo�en� NEJSOU bezpe�n�!\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "kl�� %08lX byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu "
-#~ "nebo\n"
-#~ "je probl�m se syst�mov�m �asem)\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "kl�� %08lX byl vytvo�en %lu sekund v budoucnosti (do�lo ke zm�n� �asu "
-#~ "nebo\n"
-#~ "je probl�m se syst�mov�m �asem)\n"
-
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "kl�� %08lX ozna�en jako absolutn� d�v�ryhodn�.\n"
-
-#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-#~ msgstr "podpis od podepisovac�ho kl��e Elgamal %08lX na %08lX p�esko�en\n"
-
-#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-#~ msgstr "podpis od %08lX na podepisovac�m kl��i Elgamal %08lX p�esko�en\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr ""
-#~ "kontrola v hloubce %d podeps�no=%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 ""
-#~ "Vyberte algoritmus.\n"
-#~ "\n"
-#~ "DSA (naz�van� tak� DSS) je algoritmus digit�ln�ho podpisu, kter� m��e "
-#~ "b�t\n"
-#~ "pou�it� pouze pro podpisy. Je to doporu�ovan� algoritmus, proto�e "
-#~ "ov��en�\n"
-#~ "DSA podpis� je mnohem rychlej�� ne� v algoritmu ElGamal.\n"
-#~ "\n"
-#~ "Algoritmus ElGamal m��e b�t pou��v�n jak pro podpisy tak pro �ifrov�n�.\n"
-#~ "Standard OpenPGP rozli�uje mezi dv�ma re�imy tohoto algoritmu:\n"
-#~ "pouze �ifrov�n� a �ifrov�n�+podpis; v podstat� je to stejn�, ale n�kolik\n"
-#~ "parametr� mus� b�t vybr�no speci�ln�m zp�sobem pro vytvo�en� bezpe�n�ho "
-#~ "kl��e\n"
-#~ "pro podpisy: tento program to um�, ale nen� vy�adov�no, aby i jin�\n"
-#~ "implementace OpenPGP pracovaly v re�imu podpis+�ifrov�n�.\n"
-#~ "\n"
-#~ "Prvn� (prim�rn�) kl�� mus� b�t v�dy kl��, kter� je schopn� podepisovat;\n"
-#~ "to je d�vod, pro� v tomto menu nen� k dispozi kl�� algoritmu ElGamal\n"
-#~ "ur�n� pouze pro �ifrov�n�."
-
-#~ 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 ""
-#~ "A�koli jsou tyto kl��e definov�ny v RFC2440, nejsou doporu�ov�ny,\n"
-#~ "proto�e nejsou podporov�ny v�emi programy a podpisy jimi vytvo�en�\n"
-#~ "jsou zna�n� velk� a pro ov��en� velmi pomal�."
-
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "%lu kl��� ji� zkontrolov�no (%lu podpis�)\n"
-
-#~ msgid "key incomplete\n"
-#~ msgstr "kl�� nen� kopletn�\n"
+#~ "tento �ifrovac� algoritmus se nedoporu�uje; pros�m, pou�ijte n�jak� "
+#~ "standardn�j��!\n"
 
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "kl�� %08lX nen� kompletn�\n"
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "zapisuji do souboru '%s'\n"
diff --git a/po/da.po b/po/da.po
index 7ebbc8236..e45f507bf 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -16,11 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -35,11 +30,12 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -72,9 +68,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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"
 msgstr "kan ikke oprette %s: %s\n"
@@ -126,91 +122,151 @@ 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:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "fejl i trailerlinie\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "fjern n�gle fra den hemmelige n�glering"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gener�r et nyt n�glepar"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "fjernelse af beskyttelse fejlede: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, 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:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -296,14 +352,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Dit valg? "
 
@@ -311,142 +367,151 @@ msgstr "Dit valg? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -454,232 +519,256 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "afslut"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "a"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "hj�lp"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "vis"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "aflus"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "sl�til"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign�r"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 msgid "forcesig"
 msgstr ""
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "generel fejl"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "kodeord"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Indtast bruger-id: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Indtast bruger-id: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Gentag kodes�tning: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -689,13 +778,13 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -736,7 +825,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -755,7 +844,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -780,7 +869,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -877,27 +966,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1080,21 +1169,21 @@ msgstr "lav ingen �ndringer"
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1114,16 +1203,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 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:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1133,7 +1222,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1141,497 +1230,497 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2711
+#: g10/g10.c:2744
 #, 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:2713
+#: g10/g10.c:2746
 #, 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1640,27 +1729,27 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2169
+#: g10/getkey.c:2189
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
@@ -1929,373 +2018,373 @@ msgstr "Ingen hj�lp tilg�ngelig"
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, 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:887
+#: g10/import.c:889
 #, 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:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
@@ -2519,7 +2608,7 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
 #: g10/keyedit.c:918
@@ -2568,7 +2657,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2598,7 +2687,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -3091,305 +3180,300 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
+#: g10/keyedit.c:2397
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
+#: g10/keyedit.c:2405
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2400
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
-
-#: g10/keyedit.c:2408
-msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
-"unless you restart the program.\n"
-msgstr ""
-
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2536
 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:2599
+#: g10/keyedit.c:2596
 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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 #, 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:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 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:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, 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:3499
+#: g10/keyedit.c:3496
 #, 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:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 #, 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:3741
+#: g10/keyedit.c:3738
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, 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:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3432,12 +3516,12 @@ msgstr "skriver selvsignatur\n"
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
@@ -3505,82 +3589,60 @@ msgstr "   (%d) DSA (sign�r kun)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA tillader kun n�glest�rrelser fra 512 til 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr ""
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA n�glepar vil have 1024 bit.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
-msgstr ""
-
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3590,7 +3652,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3600,42 +3662,42 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3645,44 +3707,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3693,28 +3755,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 #, 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3722,12 +3784,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3735,7 +3797,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3743,110 +3805,106 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA n�glepar vil have 1024 bit.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
 msgstr ""
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -3894,32 +3952,32 @@ msgstr ""
 msgid "expired: %s)"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4273,7 +4331,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
@@ -4306,28 +4364,40 @@ msgstr "gammeldags (PGP 2.x) signatur\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "kan ikke sl� core-dump fra: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr ""
+#: g10/misc.c:299
+#, 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:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "uimplementeret cifferalgoritme"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s signatur fra: %s\n"
+
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4435,50 +4505,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4486,42 +4556,42 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr ""
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batch mode\n"
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
+msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4530,17 +4600,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -4740,7 +4810,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dette kan betyde at signaturen er forfalsket.\n"
 
 #: g10/pkclist.c:527
@@ -4844,28 +4915,28 @@ msgstr "ingen gyldige adresser\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -5168,50 +5239,45 @@ msgstr "%s signatur fra: %s\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "skriver til `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
@@ -5393,12 +5459,12 @@ msgstr ""
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr ""
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr ""
@@ -5448,85 +5514,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "tilf�j n�gle"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "udl�b"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "ukendt version"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5835,6 +5936,17 @@ 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 "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA tillader kun n�glest�rrelser fra 512 til 1024\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "skriver til `%s'\n"
+
 #, fuzzy
 #~ msgid "key `%s' not found: %s\n"
 #~ msgstr "%s: bruger ikke fundet: %s\n"
@@ -5930,14 +6042,6 @@ msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 #~ msgstr "rev- forkert n�gletilbagekald\n"
 
 #, fuzzy
-#~ msgid "[revoked] "
-#~ msgstr "tilf�j n�gle"
-
-#, fuzzy
-#~ msgid "[expired] "
-#~ msgstr "udl�b"
-
-#, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "N�gle udl�ber d. %s\n"
 
diff --git a/po/de.po b/po/de.po
index 7d3eb2531..d65237834 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+0100\n"
 "PO-Revision-Date: 2004-10-05 10:11+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -13,11 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "Hashmethode `%s' ist in diesem Release read-only\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -32,11 +27,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -70,9 +66,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "'%s' kann nicht erzeugt werden: %s\n"
@@ -127,90 +123,150 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' ist bereits komprimiert\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "Ein neues Schl�sselpaar erzeugen"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -298,15 +354,15 @@ msgstr "Geheimer Schl�ssel ist nicht vorhanden"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
@@ -314,143 +370,152 @@ msgstr "Ihre Auswahl? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "nicht bearbeitet"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "ge�nderte Voreinstellungen"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ung�ltiges Feld in der Voreinstellungszeichenkette\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingerabdruck:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ung�ltiger Fingerabdruck\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -458,233 +523,257 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "Allgemeiner Fehler"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Geben Sie die User-ID ein: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Geben Sie die User-ID ein: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Geben Sie die Passphrase nochmal ein: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -694,13 +783,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -746,7 +835,7 @@ msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -767,7 +856,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -798,7 +887,7 @@ msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -906,28 +995,28 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schl�ssel %08lX: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
@@ -1106,15 +1195,15 @@ msgstr "Keine wirklichen �nderungen durchf�hren"
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1123,7 +1212,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1143,17 +1232,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 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:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1163,7 +1252,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1171,73 +1260,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition \"%s\"\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis (%s) \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte (%s) \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1245,19 +1334,19 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des Verzeichnisses der "
 "Konfigurationsdatei \"%s\"\n"
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1265,386 +1354,386 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des Verzeichnisses der Konfigurationsdatei "
 "\"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import Option.\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export Option.\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "Ung�ltige Import Option\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr���er als 0 sein\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr���er als 1 sein\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key User-ID"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key User-ID"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1652,23 +1741,23 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -1677,30 +1766,30 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -2076,393 +2165,393 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %08lX: HKP Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, 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:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
@@ -2709,7 +2798,8 @@ msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
 # translated by wk
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
 #: g10/keyedit.c:918
@@ -2782,7 +2872,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2813,7 +2903,7 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -3291,83 +3381,67 @@ msgstr "Keyserver no-modify"
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[widerrufen]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3375,8 +3449,20 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[widerrufen]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
 # translated by wk
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2536
 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"
@@ -3384,7 +3470,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3394,45 +3480,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3442,37 +3528,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3480,129 +3566,129 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3643,12 +3729,12 @@ msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schl�ssell�nge auf %u Bit aufgerundet\n"
@@ -3718,90 +3804,60 @@ msgstr "   (%d) DSA (nur signieren/beglaubigen)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nur verschl�sseln)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur verschl�sseln)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Es wird ein neues %s Schl�sselpaar erzeugt.\n"
-"              kleinste Schl�ssell�nge ist  768 Bit\n"
-"              standard Schl�ssell�nge ist 1024 Bit\n"
-"      gr���te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "Sch�sselgr���e zu hoch; %d ist der Maximalwert.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Schl�ssell�ngen gr���er als 2048 werden nicht empfohlen, da die\n"
-"Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Welche Schl�ssell�nge w�nschen Sie? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
-"abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3817,7 +3873,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:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3833,29 +3889,29 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schl�ssel g�ltig? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Wie lange bleibt die Beglaubigung g�ltig? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s verf�llt nie.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s verf�llt am %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3863,12 +3919,12 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3885,44 +3941,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3933,27 +3989,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3961,12 +4017,12 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3979,7 +4035,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3990,54 +4046,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "Das DSA-Schl�sselpaar wird 1024 Bit haben.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer �ffentlicher Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schl�sselbund gefunden: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des �ff. Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schl�sselbundes `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -4046,12 +4098,12 @@ msgstr ""
 "werden kann.  Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4059,7 +4111,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4067,40 +4119,40 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "l�schen des Schl�sselblocks fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4146,28 +4198,28 @@ msgstr "Schl�sselbund"
 msgid "expired: %s)"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4527,7 +4579,7 @@ msgstr "Bin�re"
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -4559,28 +4611,41 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-dump-Dateierzeugung kann nicht abgeschaltet werden: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "Verschl�sselungsverfahren ist nicht implementiert"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4690,51 +4755,51 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "Client-PID f�r den Agent kann nicht gesetzt werden\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "Server-Lese-Handle f�r den Agent nicht verf�gbar\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "Server-Schreib-Handle f�r den Agent nicht verf�gbar\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4745,41 +4810,41 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "Passphrase ist zu lang\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "Falsche Antwort des Agenten\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4789,17 +4854,17 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
@@ -5012,7 +5077,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
 #: g10/pkclist.c:527
@@ -5123,28 +5189,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie daf�r die Option \"--output\"\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -5488,54 +5554,49 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "Schreiben nach '%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schl�ssel machen\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "Schl�ssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "�bersprungen '%s': doppelt\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "�bersprungen '%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5725,12 +5786,12 @@ msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "Eingabezeile ist l�nger als %d Zeichen\n"
@@ -5782,88 +5843,125 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[widerrufen]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[verfallen]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "unbekannt"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+#, fuzzy
+msgid "[marginal]"
+msgstr "marginal"
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+#, fuzzy
+msgid "[ultimate]"
+msgstr "uneingeschr�nkt"
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "niemals   "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr "vollst�ndig"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "\"Trust-DB\"-�berpr�fung ist beim \"%s\"-Vertrauensmodell nicht n�tig\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "\"Trust-DB\"-�nderung ist beim \"%s\"-Vertrauensmodell nicht n�tig\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchf�hren\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
 # translated by wk
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schl�ssel verarbeitet (%d Validity Z�hler gel�scht)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "kein uneingeschr�nkt vertrauensw�rdiger Schl�ssel %08lX gefunden\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n"
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6177,6 +6275,62 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "Hashmethode `%s' ist in diesem Release read-only\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 ""
+#~ "Es wird ein neues %s Schl�sselpaar erzeugt.\n"
+#~ "              kleinste Schl�ssell�nge ist  768 Bit\n"
+#~ "              standard Schl�ssell�nge ist 1024 Bit\n"
+#~ "      gr���te sinnvolle Schl�ssell�nge ist 2048 Bit\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "zu kurz; 1024 ist die kleinste f�r RSA m�gliche Schl�ssell�nge.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "Sch�sselgr���e zu hoch; %d ist der Maximalwert.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Schl�ssell�ngen gr���er als 2048 werden nicht empfohlen, da die\n"
+#~ "Berechnungen dann WIRKLICH lange brauchen!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
+#~ "abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Experimentiermethoden sollten nicht benutzt werden!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "Es ist davon abzuraten, diese Verschl�sselungsmethode zu benutzen!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "Schreiben nach '%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
@@ -6308,12 +6462,6 @@ msgstr ""
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? Schwierigkeiten bei der Widerruf-�berpr�fung: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[widerrufen]"
-
-#~ msgid "[expired] "
-#~ msgstr "[verfallen]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [verf�llt: %s]"
diff --git a/po/el.po b/po/el.po
index 7d61d5c29..c71eb8cab 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -14,12 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-"� ���������� ��������� `%s' ����� �� ���� ��� ������ ��� �������� ����\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -34,11 +28,12 @@ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -73,9 +68,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "�������� ����������� ��� `%s': %s\n"
@@ -128,90 +123,150 @@ msgstr ""
 "�� ����������� �� ����������� ������� ����� ���� �� ������������\n"
 "����������� ��������! (����������� %d ����������� bytes)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "������ ��� ���������� ��� ������ ������: %s\n"
+
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' ��� �����������\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "���������� ���� ���� ������� ��������"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "�������� block �������� �������: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "� ���������� �������� �������: %s\n"
+
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -299,15 +354,15 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
@@ -315,141 +370,150 @@ msgstr "� ������� ���; "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -457,232 +521,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "�����������"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "������ ������"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "����������� �� ����� ������: "
+
+#: g10/cardglue.c:718
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -692,13 +778,13 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -742,7 +828,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -761,7 +847,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -792,7 +878,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -899,27 +985,27 @@ msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:361
+#: g10/export.c:384
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
@@ -1098,15 +1184,15 @@ msgstr "�� �� ����� ������ ������"
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1114,7 +1200,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1134,15 +1220,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1152,7 +1238,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1160,474 +1246,474 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1635,23 +1721,23 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1660,28 +1746,28 @@ msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -2044,384 +2130,384 @@ msgstr "��� ������� ��������� �������"
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1320
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1516
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1555
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1729
+#: g10/import.c:1731
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
@@ -2659,7 +2745,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
 #: g10/keyedit.c:918
@@ -2734,7 +2821,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2765,7 +2852,7 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
@@ -3243,83 +3330,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[����������]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3327,7 +3398,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[����������]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3335,7 +3418,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3344,45 +3427,45 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3392,38 +3475,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3431,129 +3514,129 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ������� ���������� ������ �� ������ %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3595,12 +3678,12 @@ msgstr "������� ����-���������\n"
 msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@ -3668,95 +3751,60 @@ msgstr "   (%d) DSA (��� �������� ����)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (��� ������������� ����)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (��� ������������� ����)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 keypair.\n"
-"              �������� ������� �������� �����  768 bits\n"
-"              �������������� ������� �������� ����� 1024 bits\n"
-"    ������� ������������ ������� �������� ����� 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "�� ������� �������� �� ������; (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "� DSA ��������� ���� ������� �������� ��� 512 ��� 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"�� ������� �������� ����� ���� �����, 1024 ����� � �������� ���� ��� RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr ""
-"�� ������� �������� ����� ���� �����, 768 ����� � �������� ������������ "
-"����.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr ""
-"�� ������� �������� ����� ���� ������, %d ����� � ������� ���� ��� "
-"�����������.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"������ �������� ���������� ��� 2048 ��� ����������� �����\n"
-"�� ����������� ����� ����������!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "������� ������ ���� �� ������� ��������; "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"�������, ���� �� ����� ��'��� ��� � ����� ��� �� ������������ �����\n"
-"������ ���� ����� �� ���������!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3772,7 +3820,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3788,29 +3836,29 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3818,12 +3866,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3840,44 +3888,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3888,27 +3936,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1750
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3916,12 +3964,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3933,7 +3981,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3945,54 +3993,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -4002,12 +4046,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4015,7 +4059,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4023,42 +4067,42 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4104,28 +4148,28 @@ msgstr "����������"
 msgid "expired: %s)"
 msgstr " [�����: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4480,7 +4524,7 @@ msgstr "�������"
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "�������"
 
@@ -4512,30 +4556,42 @@ msgstr "�������� ������ ���� (PGP 2.x)\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�������� ��������������� ��� core dump: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "������������ ���������� ��� ������ �� ����������������!\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "�� ������������ ���������� ��������������"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"� ����� ����� ��� ���������� �������������� ��� ����������. �������������� "
-"��� ��� �����������!\n"
+"� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
+"����������� ��� ���������\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4645,50 +4701,50 @@ msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "�������� ������� ��� pid ��� ������ ��� �� agent\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "�������� ��������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "�������� �������� ��� FD ��� �� ���������� ��� ��� agent\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4700,41 +4756,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "�� ������ �������� ��� ��� agent\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4744,17 +4800,17 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
@@ -4962,7 +5018,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "�������������: ���� �� ������ ���� ��������� ��� ��� ��������� ���!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         ���� ������ �� �������� ��� � �������� ����� ������������.\n"
 
 #: g10/pkclist.c:527
@@ -5069,28 +5126,28 @@ msgstr "������ ������ ���������\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
@@ -5420,12 +5477,7 @@ msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "������� ���  `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5433,41 +5485,41 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5655,12 +5707,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:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�������� ��������� ������� �������� ����������� ��� %d ����������\n"
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "������ ������� ���������� ��� %d ����������\n"
@@ -5712,86 +5764,121 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[����������]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[�������]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "�������"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6100,6 +6187,70 @@ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "� ���������� ��������� `%s' ����� �� ���� ��� ������ ��� �������� ����\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 keypair.\n"
+#~ "              �������� ������� �������� �����  768 bits\n"
+#~ "              �������������� ������� �������� ����� 1024 bits\n"
+#~ "    ������� ������������ ������� �������� ����� 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "� DSA ��������� ���� ������� �������� ��� 512 ��� 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "�� ������� �������� ����� ���� �����, 1024 ����� � �������� ���� ��� "
+#~ "RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr ""
+#~ "�� ������� �������� ����� ���� �����, 768 ����� � �������� ������������ "
+#~ "����.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr ""
+#~ "�� ������� �������� ����� ���� ������, %d ����� � ������� ���� ��� "
+#~ "�����������.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "������ �������� ���������� ��� 2048 ��� ����������� �����\n"
+#~ "�� ����������� ����� ����������!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "������� ������ ���� �� ������� ��������; "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "�������, ���� �� ����� ��'��� ��� � ����� ��� �� ������������ �����\n"
+#~ "������ ���� ����� �� ���������!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "������������ ���������� ��� ������ �� ����������������!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "� ����� ����� ��� ���������� �������������� ��� ����������. "
+#~ "�������������� ��� ��� �����������!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "������� ���  `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
@@ -6228,12 +6379,6 @@ msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? �������� ���� ������ ���������: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[����������]"
-
-#~ msgid "[expired] "
-#~ msgstr "[�������]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [�����: %s]"
diff --git a/po/eo.po b/po/eo.po
index 04a02dc53..f83015399 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -14,11 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -33,11 +28,12 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -71,9 +67,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "ne povas krei '%s': %s\n"
@@ -124,90 +120,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: eraro dum legado de libera registro: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "'%s' jam densigita\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "krei novan �losilparon"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -295,15 +351,15 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Via elekto? "
 
@@ -311,141 +367,150 @@ msgstr "Via elekto? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -453,233 +518,257 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "fini"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "f"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "helpo"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "listo"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "spuri"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "en"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsub"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fsp"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "�enerala eraro"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "pasf"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Donu la uzantidentigilon: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Donu la uzantidentigilon: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Ripetu pasfrazon: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -689,13 +778,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -738,7 +827,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -757,7 +846,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -782,7 +871,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -881,27 +970,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1080,15 +1169,15 @@ msgstr "fari neniajn �an�ojn"
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1096,7 +1185,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1116,15 +1205,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1134,7 +1223,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1142,469 +1231,469 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 #, 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:2713
+#: g10/g10.c:2746
 #, 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key uzantidentigilo"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key uzantidentigilo"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1613,24 +1702,24 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1639,27 +1728,27 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -2012,375 +2101,375 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
@@ -2636,7 +2725,7 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
 #: g10/keyedit.c:918
@@ -2707,7 +2796,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2738,7 +2827,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -3222,95 +3311,91 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
+#: g10/keyedit.c:2397
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr ""
+
+#: g10/keyedit.c:2405
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2400
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
-
-#: g10/keyedit.c:2408
-msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
-"unless you restart the program.\n"
-msgstr ""
-
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2536
 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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3319,46 +3404,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 #, 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3368,164 +3453,164 @@ 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:2888
+#: g10/keyedit.c:2885
 #, 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:2908
+#: g10/keyedit.c:2905
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 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:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, 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:3499
+#: g10/keyedit.c:3496
 #, 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:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 #, 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:3741
+#: g10/keyedit.c:3738
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3568,12 +3653,12 @@ msgstr "skribas mem-subskribon\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
@@ -3641,90 +3726,60 @@ msgstr "   (%d) DSA (nur subskribi)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nur �ifri)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (nur �ifri)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Kreos novan %s-�losilparon.\n"
-"                minimuma �losilgrando estas  768 bitoj\n"
-"               implicita �losilgrando estas 1024 bitoj\n"
-" plej granda rekomendata �losilgrando estas 2048 bitoj\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Kiun �losilgrandon vi deziras? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "�losilgrando tro granda; %d estas plej granda permesata valoro.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
-"�ar la komputado da�ras TRE longe!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
-"facile kaptebla!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3740,7 +3795,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3756,29 +3811,29 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3786,12 +3841,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3807,44 +3862,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3855,27 +3910,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3883,12 +3938,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3900,7 +3955,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3912,54 +3967,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA-�losilparo havos 1024 bitojn.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3967,12 +4018,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3980,7 +4031,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3988,40 +4039,40 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4069,32 +4120,32 @@ msgstr "�losilaro"
 msgid "expired: %s)"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4450,7 +4501,7 @@ msgstr "�efa"
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
@@ -4482,28 +4533,40 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ne povas mal�alti kreadon de core-dosieroj: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "aktualigo de fido-datenaro malsukcesis: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "nerealigita �ifrad-metodo"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s-subskribo de: %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4612,50 +4675,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "ne povas agordi kliento-PID por la agento\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "ne povas akiri lego-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "ne povas akiri skribo-FD de servilo por la agento\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokolversio %d de gpg-agent ne estas uzebla\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4666,41 +4729,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "nevalida respondo de agento\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4710,17 +4773,17 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -4926,7 +4989,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tio povas signifi, ke la subskribo estas falsa.\n"
 
 #: g10/pkclist.c:527
@@ -5029,28 +5093,28 @@ msgstr "mankas validaj adresitoj\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@ -5367,52 +5431,47 @@ msgstr "%s-subskribo de: %s\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "skribas al '%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5598,12 +5657,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "enigata linio pli longa ol %d signojn\n"
@@ -5653,85 +5712,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "rev"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "eksval"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "nekonata versio"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6042,6 +6136,59 @@ 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 ""
+#~ "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 ""
+#~ "Kreos novan %s-�losilparon.\n"
+#~ "                minimuma �losilgrando estas  768 bitoj\n"
+#~ "               implicita �losilgrando estas 1024 bitoj\n"
+#~ " plej granda rekomendata �losilgrando estas 2048 bitoj\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permesas �losilgrandon nur inter 512 kaj 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "�losilgrando tro malgranda; 1024 estas plej eta valoro por RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "�losilgrando tro malgranda; 768 estas plej eta permesata valoro.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "�losilgrando tro granda; %d estas plej granda permesata valoro.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "�losilgrandoj pli grandaj ol 2048 ne estas rekomendataj,\n"
+#~ "�ar la komputado da�ras TRE longe!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "�u vi estas certa, ke vi deziras �i tiun �losilgrandon? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Bone, sed pripensu, ke la elradiado de viaj ekrano kaj klavaro estas tre "
+#~ "facile kaptebla!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Eksperimentaj metodoj ne estu uzataj!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "�i tiu �ifrad-metodo estas malrekomendata; bonvolu uzi pli normalan!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "skribas al '%s'\n"
+
 #, fuzzy
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "ne povas fari tion en neinteraga re�imo\n"
@@ -6172,14 +6319,6 @@ msgstr "(eble vi uzis la mal�ustan programon por �i tiu tasko)\n"
 #~ msgstr "rev? problemo en kontrolo de revoko: %s\n"
 
 #, fuzzy
-#~ msgid "[revoked] "
-#~ msgstr "rev"
-
-#, fuzzy
-#~ msgid "[expired] "
-#~ msgstr "eksval"
-
-#, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [eksvalidi�os: %s]"
 
diff --git a/po/es.po b/po/es.po
index 6c1ff407a..5521c1a5b 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -18,11 +18,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "el algoritmo de resumen `%s' es de s�lo lectura en esta versi�n\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -37,11 +32,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -80,9 +76,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "no se puede crear %s: %s\n"
@@ -137,90 +133,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: error leyendo registro libre: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' ya est� comprimido\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera un nuevo par de claves"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "borrado de bloque de anillo de claves fallido: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "borrado de bloque de anillo de claves fallido: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -308,15 +364,15 @@ msgstr "clave secreta no disponible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
@@ -324,143 +380,152 @@ msgstr "Su elecci�n: "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "habcla"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "habcla"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "no procesado"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido en cadena de preferencias\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Huella dactilar:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: huella dactilar no v�lida\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -468,233 +533,257 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave deseado:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, 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:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "salir|fin|acabar"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "s"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "ayuda"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "lista"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Clave disponible en: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depura"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "habcla"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "firmal"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia fecha de caducidad"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia valores de confianza"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "hdac"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revfir"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "Error general"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nuevo par de claves"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "contr"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Introduzca el ID de usuario: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Introduzca el ID de usuario: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repita frase contrase�a: "
+
+#: g10/cardglue.c:718
+#, 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:3577 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,13 +793,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -753,7 +842,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -772,7 +861,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -800,7 +889,7 @@ msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -907,28 +996,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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %08lX: no protegida - omitida\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1111,11 +1200,11 @@ msgstr "no hace ning�n cambio"
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
@@ -1123,7 +1212,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:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1131,7 +1220,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1151,15 +1240,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1169,7 +1258,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1177,451 +1266,451 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, 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:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-usuario"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-usuario"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1629,11 +1718,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:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1641,23 +1730,23 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
@@ -1666,27 +1755,27 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Identificador de usuario no encontrado]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %08lX: clave secreta sin clave p�blica - omitida\n"
@@ -2048,381 +2137,381 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "firma %s de: \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %08lX: reparada la subclave HKP corrompida\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %08lX: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %08lX: clave nueva - omitida\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %08lX: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %08lX: no coincide con nuestra copia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %08lX: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %08lX: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %08lX: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %08lX: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %08lX: \"%s\" sin cambios\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave que unir\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %08lX: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %08lX: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %08lX: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %08lX: omitido ID de usuario '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %08lX: subclave omitida\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, 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:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %08lX: firma directa de clave a�adida\n"
@@ -2659,7 +2748,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
 #: g10/keyedit.c:918
@@ -2732,7 +2822,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2763,7 +2853,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
@@ -3243,83 +3333,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (confidencial)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revocada]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expira"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3327,7 +3401,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revocada]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expira"
+
+#: g10/keyedit.c:2536
 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"
@@ -3335,7 +3421,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3344,45 +3430,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3391,163 +3477,163 @@ 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:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, 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:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3590,12 +3676,12 @@ msgstr "escribiendo autofirma\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
@@ -3663,90 +3749,60 @@ msgstr "   (%d) DSA (s�lo firmar)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (s�lo cifrar)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s�lo cifrar)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Listo para generar un nuevo par de claves %s.\n"
-"              el tama�o m�nimo es 768 bits\n"
-"        el tama�o por defecto es 1024 bits\n"
-" el tama�o m�ximo recomendado es 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "�De qu� tama�o quiere la clave (1024)? "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"No se recomiendan claves de m�s de 2048 bits porque\n"
-"�el tiempo de c�lculo es REALMENTE largo!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "�Seguro que quiere una clave de este tama�o? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "�De qu� tama�o quiere la clave (1024)? "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
-"teclado tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3762,7 +3818,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3778,29 +3834,29 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Clave v�lida �durante (0)? "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nunca caduca\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3808,12 +3864,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3830,44 +3886,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3878,29 +3934,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3908,12 +3964,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3925,7 +3981,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3938,54 +3994,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "El par de claves DSA tendr� 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3993,12 +4045,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4006,7 +4058,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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4014,40 +4066,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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, 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:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4093,28 +4145,28 @@ msgstr "Anillo de claves"
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "    Huella de clave ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4467,7 +4519,7 @@ msgstr "binaria"
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "desconocido"
 
@@ -4498,30 +4550,42 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "no se pueden desactivar los volcados de core: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, 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:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "�No se deber�an usar algoritmos experimentales!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritmo de cifrado no implementado"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "firma %s de: \"%s\"\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
-"est�ndar!\n"
+"forzar el algoritmo de resumen %s (%d) va en contra de las\n"
+"preferencias del destinatario\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4630,50 +4694,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "no puedo establecer pid para el agente\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "no puedo conseguir el FD de lectura para el agente\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "no puedo conseguir el FD de escritura para el agente\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4684,41 +4748,41 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %08lX, creada el %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "frase contrase�a demasiado larga\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "respuesta del agente inv�lida\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4728,17 +4792,17 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
@@ -4945,7 +5009,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
 #: g10/pkclist.c:527
@@ -5049,28 +5114,28 @@ msgstr "no hay direcciones v�lidas\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
@@ -5392,12 +5457,7 @@ msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "escribiendo en `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5405,38 +5465,38 @@ msgstr ""
 "forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' omitido: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5627,12 +5687,12 @@ msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "l�nea de longitud superior a %d caracteres\n"
@@ -5682,85 +5742,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocada]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[caducada]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "desconocido"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %08lX no encontrada: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves totalmente fiables\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave totalmente fiable %08lX no encontrada\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confianza %lu, tipo %d: fallo escritura: %s\n"
@@ -6095,6 +6190,64 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "el algoritmo de resumen `%s' es de s�lo lectura en esta versi�n\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 ""
+#~ "Listo para generar un nuevo par de claves %s.\n"
+#~ "              el tama�o m�nimo es 768 bits\n"
+#~ "        el tama�o por defecto es 1024 bits\n"
+#~ " el tama�o m�ximo recomendado es 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "tama�o de clave insuficiente; 1024 es el m�nimo permitido para RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "tama�o excesivo; %d es el m�ximo valor permitido.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "No se recomiendan claves de m�s de 2048 bits porque\n"
+#~ "�el tiempo de c�lculo es REALMENTE largo!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "�Seguro que quiere una clave de este tama�o? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "De acuerdo, �pero tenga en cuenta que las radiaciones de su monitor y\n"
+#~ "teclado tambi�n son vulnerables a un ataque!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "�No se deber�an usar algoritmos experimentales!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "ese algoritmo de cifrado est� desacreditado;�por favor use uno m�s "
+#~ "est�ndar!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "escribiendo en `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
 
@@ -6225,12 +6378,6 @@ msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? problema comprobando la revocaci�n: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revocada]"
-
-#~ msgid "[expired] "
-#~ msgstr "[caducada]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [caduca: %s]"
diff --git a/po/et.po b/po/et.po
index 706fbbcc5..0ac2fcbe5 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -14,11 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "s�numil�hendi algoritm `%s' ei ole selles versioonis muudetav\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -33,11 +28,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -70,9 +66,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "`%s' ei �nnestu luua: %s\n"
@@ -125,90 +121,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "viga v�tmebloki lugemisel: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: viga vaba kirje lugemisel: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' on juba pakitud\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genereeri uus v�tmepaar"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -295,15 +351,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Teie valik? "
 
@@ -311,141 +367,150 @@ msgstr "Teie valik? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -453,232 +518,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, 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:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "v�lju"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "v"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "�ldine viga"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Korrake parooli: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -688,13 +775,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -737,7 +824,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -756,7 +843,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -783,7 +870,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -887,27 +974,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1086,15 +1173,15 @@ msgstr "�ra tee mingeid muutusi"
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1102,7 +1189,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1122,15 +1209,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1140,7 +1227,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1148,461 +1235,461 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key kasutaja-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key kasutaja-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1610,23 +1697,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:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1635,29 +1722,29 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, 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"
@@ -2008,378 +2095,378 @@ msgstr "Abiinfo puudub"
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, 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:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, 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:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
@@ -2615,7 +2702,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
 #: g10/keyedit.c:918
@@ -2688,7 +2776,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2719,7 +2807,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
@@ -3198,83 +3286,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[t�histatud] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3282,7 +3354,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[t�histatud] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3290,7 +3374,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3299,45 +3383,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3346,160 +3430,160 @@ 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:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3541,12 +3625,12 @@ msgstr "kirjutan iseenda allkirja\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@ -3614,90 +3698,60 @@ msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Enne uue %s v�tmepaari genereerimist.\n"
-"           minimaalne v�tmepikkus on  768 bitti\n"
-"            vaikimisi v�tmepikkus on 1024 bitti\n"
-"    suurim soovitatav v�tmepikkus on 2048 bitti\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Millist v�tmepikkust te soovite? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
-"arvutused v�tavad V�GA palju aega!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
-"v�imalikud r�ndeobjektid!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Soovitud v�tmepikkus on %u bitti\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3713,7 +3767,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3729,29 +3783,29 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3759,12 +3813,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3780,44 +3834,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3828,27 +3882,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3856,12 +3910,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3873,7 +3927,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3885,54 +3939,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3941,57 +3991,57 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4037,28 +4087,28 @@ msgstr "V�tmehoidla"
 msgid "expired: %s)"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4410,7 +4460,7 @@ msgstr "binaarne"
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "tundmatu"
 
@@ -4441,29 +4491,41 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "ei �nnestu blokeerida m�lupildi salvestamist: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "realiseerimata �ifri algoritm"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
+"s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4572,50 +4634,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "agendile ei �nnestu seada kliendi pid\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei �nnestu saada lugemise FD\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "agendiga suhtlemiseks ei �nnestu saada kirjutamise FD\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4626,41 +4688,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "liiga pikk parool\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "vigane vastus agendilt\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4670,17 +4732,17 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -4883,7 +4945,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "HOIATUS: See v�ti on omaniku poolt t�histatud!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         See v�ib t�hendada, et allkiri on v�ltsing.\n"
 
 #: g10/pkclist.c:527
@@ -4986,28 +5049,28 @@ msgstr "kehtivaid aadresse pole\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
@@ -5325,52 +5388,47 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "kirjutan faili `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5558,12 +5616,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "sisendrida on pikem, kui %d s�mbolit\n"
@@ -5613,85 +5671,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[t�histatud] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[aegunud] "
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tundmatu"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@ -6000,6 +6093,62 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "s�numil�hendi algoritm `%s' ei ole selles versioonis muudetav\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 ""
+#~ "Enne uue %s v�tmepaari genereerimist.\n"
+#~ "           minimaalne v�tmepikkus on  768 bitti\n"
+#~ "            vaikimisi v�tmepikkus on 1024 bitti\n"
+#~ "    suurim soovitatav v�tmepikkus on 2048 bitti\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA lubab v�tmepikkuseid ainult vahemikus 512 kuni 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "v�tmepikkus on liiga v�ike; RSA korral on v�ikseim v��rtus 1024.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "v�tmepikkus on liiga v�ike; v�ikseim lubatud v��rtus on 768.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "v�tmepikkus on liiga suur; suurim lubatud v��rtus on %d.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Suuremad v�tmepikkused kui 2048 ei ole soovitatavad, kuna\n"
+#~ "arvutused v�tavad V�GA palju aega!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Olete kindel, et soovite sellist v�tmepikkust? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Olgu, kuid pidage meeles, et ka teie monitor ja klaviatuur on samuti\n"
+#~ "v�imalikud r�ndeobjektid!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Eksperimentaalseid algoritme ei peaks kasutama!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "see �ifri algoritm ei ole soovitatav; kasutage palun m�nd standardsemat!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "kirjutan faili `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "vabandust, seda ei saa pakettmoodis teha\n"
 
@@ -6128,12 +6277,6 @@ msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? probleem t�histamise kontrollimisel: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[t�histatud] "
-
-#~ msgid "[expired] "
-#~ msgstr "[aegunud] "
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [aegub: %s]"
diff --git a/po/fi.po b/po/fi.po
index 597589d5d..7874c0b0b 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -30,11 +30,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -49,11 +44,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -87,9 +83,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -143,90 +139,150 @@ msgstr ""
 "antaaksesi käyttöjärjestelmälle mahdollisuuden kerätä lisää entropiaa! \n"
 "(Vielä tarvitaan %d tavua)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "virhe luettaessa avainlohkoa: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "\"%s\" on jo pakattu\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "luo uusi avainpari"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "avainlohkojen poisto epäonnistui: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -315,15 +371,15 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Valintasi? "
 
@@ -331,141 +387,150 @@ msgstr "Valintasi? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -473,232 +538,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "lopeta|sulje"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "apua"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "yleinen virhe"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Toista salasana: "
+
+#: g10/cardglue.c:718
+#, 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:3577 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,13 +795,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -757,7 +844,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -776,7 +863,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -802,7 +889,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -905,29 +992,29 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
@@ -1106,15 +1193,15 @@ msgstr "älä tee muutoksia"
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1123,7 +1210,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1142,16 +1229,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1161,7 +1248,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1169,462 +1256,462 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, 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:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, 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:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, 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:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key käyttäjätunnus"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1632,23 +1719,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:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1657,29 +1744,29 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -2040,381 +2127,381 @@ msgstr "Ei ohjeita saatavilla"
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@ -2653,7 +2740,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
 #: g10/keyedit.c:918
@@ -2726,7 +2814,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2757,7 +2845,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -3236,83 +3324,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[mitätöity] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3320,7 +3392,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[mitätöity] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3328,7 +3412,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3337,45 +3421,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3385,162 +3469,162 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 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:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, 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:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, 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:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3584,12 +3668,12 @@ msgstr "kirjoitetaan oma-allekirjoitus\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -3657,90 +3741,60 @@ msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (vain salaus)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Luomassa uutta %s-avainparia.\n"
-"      pienin sallittu avainkoko on  768 bittiä\n"
-"                oletusavainkoko on 1024 bittiä\n"
-"  suurin suositeltava avainkoko on 2048 bittiä\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Minkä kokoisen avaimen haluat? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA-avainparissa on 1024 bittiä.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "avainkoko on liian suuri; suurin sallittu arvo on %d.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"2048 bittiä suurempia avaimia ei suositella, koska\n"
-"laskenta kestää TODELLA pitkään!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Haluatko varmasti tämän kokoisen avaimen? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Hyvä on, mutta muista että näyttösi ja näppäimistösi säteily on myös "
-"alttiina salakuuntelulle!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Halutun avaimen koko on %u bittiä\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3756,7 +3810,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3772,29 +3826,29 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3802,12 +3856,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3825,44 +3879,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 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:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3873,27 +3927,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3901,12 +3955,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3918,7 +3972,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3930,54 +3984,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA-avainparissa on 1024 bittiä.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3985,12 +4035,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3998,7 +4048,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4006,40 +4056,40 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4085,28 +4135,28 @@ msgstr "Avainrengas"
 msgid "expired: %s)"
 msgstr " [vanhenee: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4464,7 +4514,7 @@ msgstr "binääri"
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "tuntematon "
 
@@ -4497,30 +4547,42 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "core-tiedostojen luontia ei voi estää: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Kokeellisia algoritmeja ei pitäisi käyttää!\n"
+#: g10/misc.c:299
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä "
-"standardimpaa!\n"
+"valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4629,50 +4691,50 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "agentille ei voida asettaa pid:tä\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "palvelin ei lue agentin FD:tä\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "palvelin ei kirjoita agentille FD:tä\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4683,41 +4745,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "salasana on liian pitkä\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "agentin lähettämä vastaus ei kelpaa\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4726,17 +4788,17 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
@@ -4946,7 +5008,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROITUS: Tämän avaimen haltija on mitätöinyt avaimen!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Tämä voi merkitä sitä, että allekirjoitus on väärennös.\n"
 
 #: g10/pkclist.c:527
@@ -5053,28 +5116,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
@@ -5402,54 +5465,49 @@ msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "kirjoitetaan kohteeseen \"%s\"\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
 "satunnaislukugeneraattorin kanssa!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5637,12 +5695,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "syöterivi on yli %d merkkiä pitkä\n"
@@ -5693,85 +5751,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[mitätöity] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[vanhentunut] "
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tuntematon "
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6080,6 +6173,64 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr ""
+#~ "tiivistealgoritmia \"%s\" voidaan ainoastaan lukea tässä julkaisussa\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 ""
+#~ "Luomassa uutta %s-avainparia.\n"
+#~ "      pienin sallittu avainkoko on  768 bittiä\n"
+#~ "                oletusavainkoko on 1024 bittiä\n"
+#~ "  suurin suositeltava avainkoko on 2048 bittiä\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA sallii avaimen koot vain väliltä 512-1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "avainkoko on liian pieni; RSA vaatii vähintään 1024.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "avainkoko on liian pieni; pienin sallittu arvo on 768.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "avainkoko on liian suuri; suurin sallittu arvo on %d.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "2048 bittiä suurempia avaimia ei suositella, koska\n"
+#~ "laskenta kestää TODELLA pitkään!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Haluatko varmasti tämän kokoisen avaimen? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Hyvä on, mutta muista että näyttösi ja näppäimistösi säteily on myös "
+#~ "alttiina salakuuntelulle!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Kokeellisia algoritmeja ei pitäisi käyttää!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "tämän salausalgoritmin käyttöä paheksutaan; ole hyvä ja käytä "
+#~ "standardimpaa!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "valitan, tätä ei voi tehdä eräajossa\n"
 
@@ -6209,12 +6360,6 @@ msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[mitätöity] "
-
-#~ msgid "[expired] "
-#~ msgstr "[vanhentunut] "
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [vanhenee: %s]"
diff --git a/po/fr.po b/po/fr.po
index 0a7f0ce9f..9c91c1cc5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # GnuPG French translation
-# Copyright (C) 1998-2003 Free Software Foundation, Inc.
+# Copyright (C) 1998-2004 Free Software Foundation, Inc.
 # Ga�l Qu�ri <[email protected]>, 1998.
 #
 # Thanks to R�mi Guyomarch <[email protected]> and <[email protected]>
@@ -9,27 +9,20 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.5\n"
+"Project-Id-Version: gnupg 1.3.93-cvs\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
-"PO-Revision-Date: 2004-06-16 20:20+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-"l'algorithme de hachage `%s' ne marche que pour la lecture dans cette\n"
-"version\n"
-
 #: cipher/primegen.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
+msgstr "impossible de g�n�rer un nombre premier avec pbits=%u qbits=%u\n"
 
 #: cipher/primegen.c:311
 #, c-format
@@ -40,11 +33,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -79,9 +73,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "impossible de cr�er `%s': %s\n"
@@ -136,90 +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:534
-#, fuzzy, c-format
+#: g10/app-openpgp.c:539
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "impossible d'initialiser la base de confiance: %s\n"
+msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:552
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
+msgstr "impossible de stocker la date de cr�ation: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, 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:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
-#, fuzzy, c-format
+#: 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
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
+msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, 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:818
-msgid "Admin PIN"
-msgstr ""
+#: g10/app-openpgp.c:865
+#, fuzzy
+msgid "|A|Admin PIN"
+msgstr "PIN d'administration"
 
-#: g10/app-openpgp.c:1301
-#, c-format
-msgid "PIN [sigs done: %lu]"
+#: g10/app-openpgp.c:1021
+#, fuzzy
+msgid "|AN|New Admin PIN"
+msgstr "PIN d'administration"
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1025
 #, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
+msgid "error getting new PIN: %s\n"
+msgstr "erreur pendant la lecture du num�ro de s�rie: %s\n"
 
-#: g10/app-openpgp.c:1668
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
 
-#: g10/app-openpgp.c:1763
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "impossible d'initialiser la base de confiance: %s\n"
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erreur pendant la lecture de l'enregistrement libre: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1107
 #, fuzzy
-msgid "reading the key failed\n"
-msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
+msgid "key already exists\n"
+msgstr "`%s' d�j� compress�\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "g�n�rer de nouvelles cl�s"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1831
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "la lecture de la cl� a �chou�\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+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
+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
 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
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
+#, c-format
+msgid "PIN [sigs done: %lu]"
+msgstr "PIN [sigs faites: %lu]"
+
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#, 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
+#, 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
+#, 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
+msgid "reading the key failed\n"
+msgstr "la lecture de la cl� a �chou�\n"
+
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -242,18 +301,17 @@ msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
 #: g10/armor.c:551
-#, fuzzy
 msgid "unexpected armor: "
-msgstr "armure inattendue:"
+msgstr "armure inattendue: "
 
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
 #: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "caract�re %02x invalide en base 64 ignor�\n"
+msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
@@ -268,12 +326,11 @@ msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
 #: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "Erreur de CRC; %06lx - %06lx\n"
+msgstr "Erreur de CRC; %06lX - %06lX\n"
 
 #: g10/armor.c:824
-#, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
@@ -298,400 +355,411 @@ msgstr ""
 "certainement d'un agent de transfert de messages bogu�\n"
 
 #: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "la cl� secr�te n'est pas disponible"
+msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 
 #: g10/card-util.c:63
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[non positionn�]"
 
-#: g10/card-util.c:376
-#, fuzzy
+#: g10/card-util.c:378
 msgid "male"
-msgstr "activer"
+msgstr "masculin"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "female"
-msgstr "activer"
+msgstr "f�minin"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "unspecified"
-msgstr "Aucune raison sp�cifi�e"
+msgstr "non sp�cifi�"
 
-#: g10/card-util.c:396
-#, fuzzy
+#: g10/card-util.c:406
 msgid "not forced"
-msgstr "non trait�"
+msgstr "non forc�"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
-msgstr ""
+msgstr "forc�"
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:502
-#, fuzzy
+#: g10/card-util.c:521
 msgid "URL to retrieve public key: "
-msgstr "pas de cl� publique correspondante: %s\n"
+msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
-msgstr ""
+msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, 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:641
-#, fuzzy
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, 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
 msgid "Language preferences: "
-msgstr "pr�f�rences mises � jour"
+msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:649
-#, fuzzy
+#: g10/card-util.c:737
 msgid "Error: invalid length of preference string.\n"
-msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
+msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:658
-#, fuzzy
+#: g10/card-util.c:746
 msgid "Error: invalid characters in preference string.\n"
-msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
+msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:693
-#, fuzzy
+#: g10/card-util.c:781
 msgid "Error: invalid response.\n"
-msgstr "erreur: empreinte invalide\n"
+msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:714
-#, fuzzy
+#: g10/card-util.c:802
 msgid "CA fingerprint: "
-msgstr "afficher l'empreinte"
+msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:825
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "erreur: empreinte invalide\n"
+msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:785
-#, fuzzy, c-format
+#: g10/card-util.c:873
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "La g�n�ration de cl� a �chou�: %s\n"
+msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:786
-#, fuzzy
+#: g10/card-util.c:874
 msgid "not an OpenPGP card"
-msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
+msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:795
-#, fuzzy, c-format
+#: g10/card-util.c:883
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "erreur durant l'�criture du porte-cl�s secret `%s': %s\n"
+msgstr ""
+"erreur durant la lecture des informations contenues actuellement\n"
+"dans la cl�: %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, 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 ""
+"Notez que les r�glages d'usine des codes PIN sont\n"
+"   PIN = `%s'     PIN admin = `%s'\n"
+"Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:968
-#, fuzzy
+#: g10/card-util.c:1056
 msgid "Please select the type of key to generate:\n"
-msgstr "S�lectionnez le type de cl� d�sir�:\n"
+msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
-#, fuzzy
+#: g10/card-util.c:1058 g10/card-util.c:1138
 msgid "   (1) Signature key\n"
-msgstr "La signature a expir� le %s\n"
+msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
-#, fuzzy
+#: g10/card-util.c:1059 g10/card-util.c:1140
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (chiffrement seul)\n"
+msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1047
-#, fuzzy
+#: g10/card-util.c:1135
 msgid "Please select where to store the key:\n"
-msgstr "choisissez la cause de la r�vocation:\n"
+msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1082
-#, fuzzy
+#: g10/card-util.c:1170
 msgid "unknown key protection algorithm\n"
-msgstr "algorithme de protection inconnu\n"
+msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1087
-#, fuzzy
+#: g10/card-util.c:1175
 msgid "secret parts of key are not available\n"
-msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
+msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1092
-#, fuzzy
+#: g10/card-util.c:1180
 msgid "secret key already stored on a card\n"
-msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
+msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quitter"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
-#: g10/card-util.c:1164
-#, fuzzy
+#: g10/card-util.c:1252
 msgid "show admin commands"
-msgstr "commandes en conflit\n"
+msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "lister"
 
-#: g10/card-util.c:1167
-#, fuzzy
+#: g10/card-util.c:1255
 msgid "list all available data"
-msgstr "Cl� disponible sur: "
+msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/card-util.c:1170
-#, fuzzy
+#: g10/card-util.c:1258
 msgid "name"
-msgstr "activer"
+msgstr "nom"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
-msgstr ""
+msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
-msgstr ""
+msgstr "url"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
-msgstr ""
+msgstr "chercher"
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "login"
-msgstr "lsigner"
+msgstr "identification"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "change the login name"
-msgstr "changer la date d'expiration"
+msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
-msgstr ""
+msgstr "langue"
 
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1263
 msgid "change the language preferences"
-msgstr "changer la confiance"
+msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
-msgstr ""
+msgstr "sexe"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
-msgstr ""
+msgstr "changer le sexe du propri�taire de la carte"
 
 # g10/keyedit.c:556 ???
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "cafpr"
-msgstr "fpr"
+msgstr "emprac"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "change a CA fingerprint"
-msgstr "afficher l'empreinte"
+msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1178
-#, fuzzy
+#: g10/card-util.c:1266
 msgid "forcesig"
-msgstr "revsig"
+msgstr "forcersig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 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:1180
-#, fuzzy
+#: g10/card-util.c:1268
 msgid "generate"
-msgstr "erreur g�n�rale"
+msgstr "g�n�rer"
 
-#: g10/card-util.c:1181
-#, fuzzy
+#: g10/card-util.c:1269
 msgid "generate new keys"
-msgstr "g�n�rer une nouvelle paire de cl�s"
+msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
+msgstr "menu pour changer ou d�verrouiller le PIN"
+
+#: g10/card-util.c:1272
+msgid "privatedo"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1281
-#, fuzzy
+#: g10/card-util.c:1371
 msgid "Admin-only command\n"
-msgstr "commandes en conflit\n"
+msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1297
-#, fuzzy
+#: g10/card-util.c:1387
 msgid "Admin commands are allowed\n"
-msgstr "commandes en conflit\n"
+msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1389
 msgid "Admin commands are not allowed\n"
-msgstr "�criture de la cl� secr�te vers `%s'\n"
+msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
+"Supprimez la carte pr�sente et ins�rez celle portant le num�ro de\n"
+"s�rie:\n"
+"   %.*s\n"
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Entrez le code PIN admin: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Entrez le code PIN: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
-msgstr ""
+msgstr "Entrez le code PIN: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "R�p�tez le mot de passe: "
+
+#: g10/cardglue.c:718
+#, 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:3577 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,13 +769,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "cl� '%s' introuvable: %s\n"
+msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -718,19 +786,16 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(� moins de sp�cifier la cl� par son empreinte)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
+msgstr "impossible de faire cela en mode automatique sans � --yes �\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Enlever cette cl� du porte-cl�s ? "
+msgstr "Enlever cette cl� du porte-cl�s ? (o/N) "
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "C'est une cl� secr�te - faut-il vraiment l'effacer ? "
+msgstr "C'est une cl� secr�te ! - faut-il vraiment l'effacer ? (o/N) "
 
 #: g10/delkey.c:157
 #, c-format
@@ -750,7 +815,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
@@ -770,7 +835,7 @@ msgstr "utilisation de l'algorithme de chiffrement %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
@@ -794,28 +859,28 @@ msgstr ""
 "lesquelles vous chiffrez.\n"
 
 #: g10/encode.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
-"avec les pr�ferences du r�cipient\n"
+"AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
+"en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:648 g10/sign.c:876
-#, fuzzy, c-format
+#: g10/encode.c:648 g10/sign.c:877
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
-"forcer l'algorithme de compression %s (%d) entre en d�saccord\n"
-"avec les pr�f�rences du r�cipient\n"
+"AVERTISSEMENT: forcer l'algorithme de compression %s (%d) entre\n"
+"en d�saccord avec les pr�f�rences du destinataire\n"
 
 #: g10/encode.c:735
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
-"avec les pr�ferences du r�cipient\n"
+"avec les pr�ferences du destinataire\n"
 
 #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
 #, c-format
@@ -865,21 +930,20 @@ msgstr ""
 "du fichier d'options sont trop peu s�res\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "cette plateforme a besoin de fichiers temporaires pour appeler des\n"
 "programmes externes\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "impossible d'ex�cuter %s � %s �: %s\n"
+msgstr "impossible d'ex�cuter le programme `%s': %s\n"
 
 #: g10/exec.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute shell `%s': %s\n"
-msgstr "impossible d'ex�cuter %s � %s �: %s\n"
+msgstr "impossible d'ex�cuter l'int�rpr�teur de commandes `%s': %s\n"
 
 #: g10/exec.c:521
 #, c-format
@@ -913,29 +977,28 @@ msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:176
-#, fuzzy
+#: g10/export.c:182
 msgid "exporting secret keys not allowed\n"
-msgstr "�criture de la cl� secr�te vers `%s'\n"
+msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:206
-#, fuzzy, c-format
+#: g10/export.c:211
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "cl� %08lX: non prot�g�e - ignor�e\n"
+msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:214
-#, fuzzy, c-format
+#: g10/export.c:219
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "cl� %08lX: cl� de style PGP 2.x - ignor�e\n"
+msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:361
-#, fuzzy, c-format
+#: g10/export.c:384
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
-"AVERTISSEMENT: la cl� secr�te %08lX n'a pas de somme de contr�le SK\n"
+"AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
@@ -984,9 +1047,8 @@ msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
 #: g10/g10.c:374
-#, fuzzy
 msgid "list and check key signatures"
-msgstr "v�rifier les signatures des cl�s"
+msgstr "lister et v�rifier les signatures des cl�s"
 
 #: g10/g10.c:375
 msgid "list keys and fingerprints"
@@ -1050,15 +1112,15 @@ msgstr "importer/fusionner les cl�s"
 
 #: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "afficher l'�tat de la carte"
 
 #: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "changer les donn�es d'une carte"
 
 #: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "changer le code PIN d'une carte"
 
 #: g10/g10.c:410
 msgid "update the trust database"
@@ -1114,15 +1176,15 @@ msgstr "ne rien changer"
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1130,7 +1192,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1150,17 +1212,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 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:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1170,7 +1232,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:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1178,486 +1240,494 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:982
-#, fuzzy, c-format
+#: g10/g10.c:1017
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "no = signature trouv�e dans la d�finition du groupe \"%s\"\n"
+msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/g10.c:1179
-#, fuzzy, c-format
+#: g10/g10.c:1214
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
+msgstr ""
+"AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
+"peu s�r\n"
 
-#: g10/g10.c:1182
-#, fuzzy, c-format
+#: g10/g10.c:1217
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
+msgstr ""
+"AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
+"est peu s�r\n"
 
-#: g10/g10.c:1185
-#, fuzzy, c-format
+#: g10/g10.c:1220
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "AVERTISSEMENT: propri�taire de %s \"%s\" peu s�r\n"
+msgstr ""
+"AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
+"s�r\n"
 
-#: g10/g10.c:1191
-#, fuzzy, c-format
+#: g10/g10.c:1226
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
+msgstr ""
+"AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
+"sont peu s�res\n"
 
-#: g10/g10.c:1194
-#, fuzzy, c-format
+#: g10/g10.c:1229
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
+msgstr ""
+"AVERTISSEMENT: les permissions du fichier de configuration\n"
+"`%s' sont peu s�res\n"
 
-#: g10/g10.c:1197
-#, fuzzy, c-format
+#: g10/g10.c:1232
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "AVERTISSEMENT: permissions de %s \"%s\" peu s�res\n"
+msgstr ""
+"AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
+"peu s�res\n"
 
-#: g10/g10.c:1203
-#, fuzzy, c-format
+#: g10/g10.c:1238
+#, 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 %s \"%s\"\n"
+"s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/g10.c:1206
-#, fuzzy, c-format
+#: g10/g10.c:1241
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
-"s�r pour %s \"%s\"\n"
+"s�r pour le fichier de configuration `%s'\n"
 
-#: g10/g10.c:1209
-#, fuzzy, c-format
+#: g10/g10.c:1244
+#, 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 %s \"%s\"\n"
+"s�r pour l'extension `%s'\n"
 
-#: g10/g10.c:1215
-#, fuzzy, c-format
+#: g10/g10.c:1250
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
-"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
-"sont peu s�res\n"
+"AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
+"r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/g10.c:1253
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
-"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
-"sont peu s�res\n"
+"AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
+"fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/g10.c:1256
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
-"AVERTISSEMENT: les permissions du r�pertoire contenant %s \"%s\"\n"
-"sont peu s�res\n"
+"AVERTISSEMENT: les permissions du r�pertoire contenant\n"
+"l'extension `%s' sont peu s�res\n"
 
-#: g10/g10.c:1362
-#, fuzzy, c-format
+#: g10/g10.c:1397
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "�l�ment de configuration \"%s\" inconnu\n"
+msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, 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:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
-#, fuzzy, c-format
+#: g10/g10.c:2079
+#, 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"
+"l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/g10.c:2260
-#, fuzzy, c-format
+#: g10/g10.c:2293
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s n'est pas une table de caract�res valide\n"
+msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
-#, fuzzy
+#: g10/g10.c:2312 g10/keyedit.c:3434
 msgid "could not parse keyserver URL\n"
-msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
+msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/g10.c:2285
-#, fuzzy, c-format
+#: g10/g10.c:2318
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: options d'export invalides\n"
+msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2288
-#, fuzzy
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
-msgstr "options d'export invalides\n"
+msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2315
-#, fuzzy, c-format
+#: g10/g10.c:2348
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: options d'import invalides\n"
+msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/g10.c:2318
-#, fuzzy
+#: g10/g10.c:2351
 msgid "invalid list options\n"
-msgstr "options d'import invalides\n"
+msgstr "options de liste invalides\n"
 
-#: g10/g10.c:2340
-#, fuzzy, c-format
+#: g10/g10.c:2373
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: options d'export invalides\n"
+msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/g10.c:2343
-#, fuzzy
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
-msgstr "options d'export invalides\n"
+msgstr "options de v�rification invalides\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2684
-#, fuzzy
+#: g10/g10.c:2717
 msgid "selected compression algorithm is invalid\n"
-msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
+msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:2709
-#, fuzzy
+#: g10/g10.c:2742
 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"
+msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2824
-#, fuzzy, c-format
+#: g10/g10.c:2857
+#, 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"
+"vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2829
-#, fuzzy, c-format
+#: g10/g10.c:2862
+#, 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"
+"vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2834
-#, fuzzy, c-format
+#: g10/g10.c:2867
+#, 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"
+"vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
-"AVERTISSEMENT: des r�cipients (-r) ont donn�s alors que le chiffrement\n"
-"ne se fait pas par cl� publique\n"
+"AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
+"chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:2961
-#, fuzzy, c-format
+#: g10/g10.c:2994
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "le d�chiffrement a �chou�: %s\n"
+msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:2984
-#, fuzzy
+#: g10/g10.c:3017
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [nom du fichier]"
+msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/g10.c:2989
-#, fuzzy, c-format
+#: g10/g10.c:3022
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3035
-#, fuzzy
+#: g10/g10.c:3068
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [nom du fichier]"
+msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 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:3040
-#, fuzzy, c-format
+#: g10/g10.c:3073
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
+msgstr ""
+"vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
+"en mode %s.\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key utilisateur"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key utilisateur"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, 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:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, 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:3271
+#: g10/g10.c:3304
 #, 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:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1665,58 +1735,57 @@ 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:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/g10.c:3911
-#, fuzzy
+#: g10/g10.c:3944
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "l'URL de politique de signature donn�e est invalide\n"
+msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
 #: g10/getkey.c:150
 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:2691
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2711
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1614
-#, fuzzy, c-format
+#: g10/getkey.c:1639
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
-"La cl� invalide %08lX a �t� rendue valide par --allow-non-selfsigned-uid\n"
+"La cl� invalide %s a �t� rendue valide par\n"
+"--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2169
-#, fuzzy, c-format
+#: g10/getkey.c:2189
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "pas de sous-cl� secr�te pour la cl� publique %08lX - ignor�e\n"
+msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2400
-#, fuzzy, c-format
+#: g10/getkey.c:2420
+#, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr ""
-"utilisation de la cl� secondaire %08lX � la place de la cl�\n"
-"principale %08lX\n"
+"utilisation de la cl� secondaire %s � la place de la cl�\n"
+"principale %s\n"
 
-#: g10/getkey.c:2447
-#, fuzzy, c-format
+#: g10/getkey.c:2467
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "cl� %08lX: cl� secr�te sans cl� publique - non prise en compte\n"
+msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
 #: g10/gpgv.c:68
 msgid "be somewhat more quiet"
@@ -1795,6 +1864,17 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"S�lectionnez l'algorithme � utiliser.\n"
+"\n"
+"DSA (connu �galement sous le nom de DSS) est un algorithme de signature\n"
+"digitale et ne peut �tre utilis� que pour des signatures.\n"
+"\n"
+"Elgamal est un algorithme pour le chiffrement seul.\n"
+"\n"
+"RSA peut �tre utilis� pour les signatures et le chiffrement.\n"
+"\n"
+"La premi�re cl� (cl� principale) doit toujours �tre une cl� capable\n"
+"de signer."
 
 #: g10/helptext.c:83
 msgid ""
@@ -1926,7 +2006,6 @@ msgstr ""
 "Si vous ne savez pas quelle r�ponse est la bonne, r�pondez \"0\"."
 
 #: g10/helptext.c:185
-#, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 msgstr "R�pondez �oui� si vous voulez signer TOUS les noms d'utilisateurs"
 
@@ -2070,387 +2149,389 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:258
+#, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:545
-#, fuzzy
+#: g10/import.c:547
 msgid "algorithms on these user IDs:\n"
-msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
+msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:596
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "signature %s, algorithme de hachage %s\n"
+msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:621
+#: g10/import.c:623
 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:645
+#: g10/import.c:647
 #, 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:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:695 g10/import.c:1049
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "cl� %08lX: pas de nom d'utilisateur\n"
+msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:715
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "cl� %08lX: corruption de sous-cl� HKP r�par�e\n"
+msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:730
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "cl� %08lX: nom d'utilisateur non auto-sign� accept� '%s':\n"
+msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:736
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "cl� %08lX: pas de nom d'utilisateur valide\n"
+msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:748 g10/import.c:1170
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "cl� %08lX: cl� publique pas trouv�e: %s\n"
+msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:754
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "cl� %08lX: nouvelle cl� - ignor�e\n"
+msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, 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:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:793
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "cl� %08lX: cl� publique \"%s\" import�e\n"
+msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:817
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "cl� %08lX: ne ressemble pas � notre copie\n"
+msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:834 g10/import.c:1188
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "cl� %08lX: impossible de trouver le bloc de cl�s original: %s\n"
+msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:842 g10/import.c:1195
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "cl� %08lX: impossible de lire le bloc de cl�s original: %s\n"
+msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:874
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "cl� %08lX: \"%s\" un nouvel utilisateur\n"
+msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:877
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "cl� %08lX: \"%s\" %d nouveaux utilisateurs\n"
+msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:880
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "cl� %08lX: \"%s\" une nouvelle signature\n"
+msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:883
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "cl� %08lX: \"%s\" %d nouvelles signatures\n"
+msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:886
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "cl� %08lX: \"%s\" une nouvelle sous-cl�\n"
+msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:889
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "cl� %08lX: \"%s\" %d nouvelles sous-cl�s\n"
+msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:910
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "cl� %08lX: \"%s\" n'a pas chang�\n"
+msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1055
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
-"cl� %08lX: cl� secr�te avec le chiffrement invalide %d - non prise\n"
+"cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1066
 msgid "importing secret keys not allowed\n"
-msgstr "�criture de la cl� secr�te vers `%s'\n"
+msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1094
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "cl� %08lX: cl� secr�te import�e\n"
+msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1123
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "cl� %08lX: d�j� dans le porte-cl�s secret\n"
+msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1133
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "cl� %08lX: cl� secr�te pas trouv�e: %s\n"
+msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1163
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
-"cl� %08lX: pas de cl� publique - le certificat de r�vocation ne peut\n"
+"cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1206
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "cl� %08lX: certificat de r�vocation invalide: %s - rejet�\n"
+msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1238
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "cl� %08lX: \"%s\" certificat de r�vocation import�\n"
+msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1303
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "cl� %08lX: pas d'utilisateur pour la signature\n"
+msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1318
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
-"cl� %08lX: algorithme de cl� publique non support� avec le nom\n"
-"d'utilisateur \"%s\"\n"
+"cl� %s: algorithme de cl� publique non support� avec le nom\n"
+"d'utilisateur � %s �\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1320
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "cl� %08lX: auto-signature du nom d'utilisateur \"%s\" invalide\n"
+msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1338
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "cl� %08lX: pas de sous-cl� pour relier la cl�\n"
+msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1349 g10/import.c:1399
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "cl� %08lX: algorithme de cl� publique non support�\n"
+msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1351
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "cl� %08lX: liaison avec la sous-cl� invalide\n"
+msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1366
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "cl� %08lX: supressions de liaisons multiples avec des sous-cl�s\n"
+msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1388
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "cl� %08lX: pas de sous-cl� pour r�voquer la cl�\n"
+msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1401
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "cl� %08lX: r�vocation de sous-cl� invalide\n"
+msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1416
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "cl� %08lX: suppression de la r�vocation de sous-cl� multiples\n"
+msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1458
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "cl� %08lX: utilisateur non pris en compte: '"
+msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1479
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "cl� %08lX: sous-cl� non prise en compte\n"
+msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1504
-#, fuzzy, c-format
+#: g10/import.c:1506
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "cl� %08lX: signature non exportable (classe %02x) - ignor�e\n"
+msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1516
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "cl� %08lX: certificat de r�vocation au mauvais endroit - ignor�e\n"
+msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1533
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "cl� %08lX: certificat de r�vocation invalide: %s - ignor�e\n"
+msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1547
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "cl� %08lX: signature de sous-cl� au mauvais endroit - ignor�e\n"
+msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1555
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "cl� %08lX: classe de signature non attendue (0x%02X) - ignor�e\n"
+msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1653
-#, fuzzy, c-format
+#: g10/import.c:1655
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "cl� %08lX: nom d'utilisateur en double fusionn�\n"
+msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1715
-#, fuzzy, c-format
+#: g10/import.c:1717
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
-"AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: recherche de la cl� de\n"
-"r�vocation %08lX\n"
+"AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
+"la cl� de r�vocation %s\n"
 
-#: g10/import.c:1729
-#, fuzzy, c-format
+#: g10/import.c:1731
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
-"AVERTISSEMENT: la cl� %08lX est peut-�tre r�voqu�e: la cl� de r�vocation\n"
-"%08lX est absente.\n"
+"AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
+"r�vocation %s est absente.\n"
 
-#: g10/import.c:1788
-#, fuzzy, c-format
+#: g10/import.c:1790
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "cl�: %08lX: \"%s\" certificat de r�vocation ajout�\n"
+msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1822
-#, fuzzy, c-format
+#: g10/import.c:1824
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "cl� %08lX: ajout de la signature de cl� directe\n"
+msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
 #: g10/keydb.c:167
 #, c-format
@@ -2512,26 +2593,26 @@ 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
-#, fuzzy
 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 ""
-"� quel point avez-vous confiance en cet utilisateur pour la v�rification\n"
-"des cl�s des autres utilisateurs (vous pouvez v�rifier son passeport,\n"
-"v�rifier les empreintes de diverses sources...) ?\n"
+"D�cidez maintenant � quel point vous avez confiance en cet utilisateur\n"
+"pour qu'il v�rifie les cl�s des autres utilisateurs (vous pouvez\n"
+"v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
+"diff�rentes, etc.)\n"
 
 #: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = je crois marginalement\n"
+msgstr "  %d = je crois marginalement\n"
 
 #: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = je fais enti�rement confiance\n"
+msgstr "  %d = je fais enti�rement confiance\n"
 
 #: g10/keyedit.c:426
 msgid ""
@@ -2539,10 +2620,15 @@ msgid ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"Entrez la profondeur de cette signature de confiance.\n"
+"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
 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
 #, c-format
@@ -2611,23 +2697,23 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
+msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
 #: g10/keyedit.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" a d�j� �t� sign� localement par la cl� %08lX\n"
+msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
 #: g10/keyedit.c:756
 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
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "Rien � signer avec la cl� %08lX\n"
+msgstr "Rien � signer avec la cl� %s\n"
 
 #: g10/keyedit.c:793
 msgid "This key has expired!"
@@ -2685,81 +2771,60 @@ 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
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
 #: g10/keyedit.c:918
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
-"avec la v�tre: \""
+"avec votre cl� � %s � (%s)\n"
 
 #: g10/keyedit.c:925
-#, fuzzy
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"cela sera une auto-signature.\n"
+msgstr "Ceci sera une auto-signature.\n"
 
 #: g10/keyedit.c:931
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
-"\n"
-"AVERTISSEMENT: la signature ne sera pas marqu�e comme non-exportable.\n"
+"AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
+"non-exportable.\n"
 
 #: g10/keyedit.c:939
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
-"\n"
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
 #: g10/keyedit.c:949
-#, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"La signature sera marqu�e comme non-exportable.\n"
+msgstr "La signature sera marqu�e comme non-exportable.\n"
 
 #: g10/keyedit.c:956
-#, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"La signature sera marqu�e comme non-r�vocable.\n"
+msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
 #: g10/keyedit.c:963
-#, fuzzy
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"Je n'ai pas du tout v�rifi� cette cl�.\n"
+msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
 #: g10/keyedit.c:968
-#, fuzzy
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"J'ai un peu v�rifi� cette cl�.\n"
+msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
 #: g10/keyedit.c:973
-#, fuzzy
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"J'ai v�rifi� cette cl� avec grand soin.\n"
+msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
 #: g10/keyedit.c:983
-#, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "Signer r�ellement ? "
+msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2788,7 +2853,7 @@ msgid ""
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
@@ -2802,9 +2867,8 @@ msgstr ""
 "\n"
 
 #: g10/keyedit.c:1135
-#, fuzzy
 msgid "Do you really want to do this? (y/N) "
-msgstr "Voulez-vous vraiment faire cela ? "
+msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
 #: g10/keyedit.c:1201
 msgid "moving a key signature to the correct place\n"
@@ -2872,14 +2936,12 @@ msgid "s"
 msgstr "s"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "tsign"
-msgstr "signer"
+msgstr "tsigner"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "make a trust signature"
-msgstr "faire une signature d�tach�e"
+msgstr "faire une signature de confiance"
 
 #: g10/keyedit.c:1260
 msgid "lsign"
@@ -2942,21 +3004,20 @@ msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
 #: g10/keyedit.c:1271
-#, fuzzy
 msgid "addcardkey"
-msgstr "aj.cl�"
+msgstr "ajcl�carte"
 
 #: g10/keyedit.c:1271
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "ajouter une cl� � une carte � puce"
 
 #: g10/keyedit.c:1272
 msgid "keytocard"
-msgstr ""
+msgstr "cl�verscarte"
 
 #: g10/keyedit.c:1272
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "d�placer une cl� vers une carte � puce"
 
 #: g10/keyedit.c:1274
 msgid "delkey"
@@ -3043,14 +3104,12 @@ msgid "updated preferences"
 msgstr "pr�f�rences mises � jour"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "keyserver"
-msgstr "erreur du serveur de cl�s"
+msgstr "servcl�s"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "set preferred keyserver URL"
-msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
+msgstr "indiquer l'URL du serveur de cl�s pr�f�r�"
 
 #: g10/keyedit.c:1287
 msgid "change the passphrase"
@@ -3113,9 +3172,9 @@ msgid "show photo ID"
 msgstr "montrer la photo d'identit�"
 
 #: g10/keyedit.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "erreur pendant la lecture du bloc de cl� secr�te `%s': %s\n"
+msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
 #: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
@@ -3134,9 +3193,8 @@ msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
 #: g10/keyedit.c:1500
-#, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "Signer vraiment tous les utilisateurs ? "
+msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
 #: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
@@ -3156,88 +3214,77 @@ msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
 #: g10/keyedit.c:1553
-#, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
+msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
 #: g10/keyedit.c:1554
-#, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "Enlever r�ellement cet utilisateur ? "
+msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
 #: g10/keyedit.c:1604
-#, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "Enlever r�ellement cet utilisateur ? "
+msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
 #: g10/keyedit.c:1616
-#, fuzzy
 msgid "You must select exactly one key.\n"
-msgstr "Vous devez s�lectionner au moins une cl�.\n"
+msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
 #: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
 #: g10/keyedit.c:1639
-#, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
+msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
 #: g10/keyedit.c:1640
-#, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "Voulez-vous vraiment supprimer cette cl� ? "
+msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
 #: g10/keyedit.c:1675
-#, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? "
+msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
 #: g10/keyedit.c:1676
-#, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "R�voquer r�ellement ce nom d'utilisateur ? "
+msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
 #: g10/keyedit.c:1695
-#, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
+msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? (o/N) "
 
 #: g10/keyedit.c:1696
-#, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
-msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
+msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
 
 #: g10/keyedit.c:1735
 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:1767
-#, fuzzy
 msgid "Set preference list to:\n"
-msgstr "donner la liste de pr�f�rences"
+msgstr "Changer la liste de pr�f�rences en :\n"
 
 #: g10/keyedit.c:1773
-#, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "Enlever r�ellement les pr�f�rences des utilisateurs s�lectionn�s ? "
+msgstr ""
+"Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
+"s�lectionn�s ? (o/N) "
 
 #: g10/keyedit.c:1775
-#, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
+msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
 #: g10/keyedit.c:1825
-#, fuzzy
 msgid "Save changes? (y/N) "
-msgstr "Enregistrer les changements? "
+msgstr "Enregistrer les changements? (o/N) "
 
 #: g10/keyedit.c:1828
-#, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "Quitter sans enregistrer? "
+msgstr "Quitter sans enregistrer ? (o/N) "
 
 #: g10/keyedit.c:1838
 #, c-format
@@ -3263,91 +3310,74 @@ msgstr "Fonctions: "
 
 #: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "Serveur de cl�s: pas-de-modification"
 
 #: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, c-format
-msgid "This key may be revoked by %s key "
-msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s "
+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:2247
-msgid " (sensitive)"
-msgstr " (sensible)"
+#: g10/keyedit.c:2251
+msgid "(sensitive)"
+msgstr "(sensible)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
-#, fuzzy, c-format
+#, c-format
 msgid "created: %s"
-msgstr "impossible de cr�er %s: %s\n"
+msgstr "cr��: %s"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#, c-format
 msgid "revoked: %s"
-msgstr "[revoqu�e] "
+msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
-#, fuzzy, c-format
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#, c-format
 msgid "expired: %s"
-msgstr " [expire: %s]"
+msgstr "expir�: %s"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
+#, c-format
 msgid "expires: %s"
-msgstr " [expire: %s]"
+msgstr "expire: %s"
 
-#: g10/keyedit.c:2270
-#, fuzzy, c-format
+#: g10/keyedit.c:2276
+#, c-format
 msgid "usage: %s"
-msgstr " confiance: %c/%c"
+msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2285
-#, fuzzy, c-format
+#: g10/keyedit.c:2291
+#, c-format
 msgid "trust: %s"
-msgstr " confiance: %c/%c"
+msgstr " confiance: %s"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "validit�: %s"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revoqu�e] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+msgstr "n� de carte: "
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3355,7 +3385,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+msgid "revoked"
+msgstr "revoqu�e"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+msgid "expired"
+msgstr "expir�e"
+
+#: g10/keyedit.c:2536
 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"
@@ -3364,7 +3404,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3374,46 +3414,46 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3423,199 +3463,192 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
-#, fuzzy
+#: g10/keyedit.c:2965
 msgid "this key has already been designated as a revoker\n"
-msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
+msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 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:2993
-#, fuzzy
+#: g10/keyedit.c:2990
 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): "
+"d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
-#, fuzzy, c-format
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#, 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"
+msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:3498
-#, fuzzy
+#: g10/keyedit.c:3495
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
+msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:3499
-#, fuzzy
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
+msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:3724
-#, fuzzy, c-format
+#: g10/keyedit.c:3721
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "nom d'utilisateur: �"
+msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
-#, fuzzy, c-format
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   sign� par %08lX � %s%s%s\n"
+msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
-#, fuzzy, c-format
+#: g10/keyedit.c:3765
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
+msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:3794
-#, fuzzy
+#: g10/keyedit.c:3791
 msgid " (non-revocable)"
-msgstr " (non-exportable)"
+msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:3801
-#, fuzzy, c-format
+#: g10/keyedit.c:3798
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   r�voqu� par %08lX � %s\n"
+msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, 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:3960
+#: g10/keyedit.c:3957
 #, 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:4129
-#, fuzzy, c-format
+#: g10/keyedit.c:4126
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
-"Affichage %s photo d'identit� de taille %ld pour la cl� 0x%08lX (uid %d)\n"
+"Affichage %s photo d'identit� de taille %ld pour la cl�\n"
+"0x%s (uid %d)\n"
 
 #: g10/keygen.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "pr�f�rence %c%lu dupliqu�e\n"
+msgstr "pr�f�rence `%s' dupliqu�e\n"
 
 #: g10/keygen.c:300
-#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "trop de pr�f�rences `%c'\n"
+msgstr "trop de pr�f�rences de chiffrement\n"
 
 #: g10/keygen.c:302
-#, fuzzy
 msgid "too many digest preferences\n"
-msgstr "trop de pr�f�rences `%c'\n"
+msgstr "trop de pr�f�rences de hachage\n"
 
 #: g10/keygen.c:304
-#, fuzzy
 msgid "too many compression preferences\n"
-msgstr "trop de pr�f�rences `%c'\n"
+msgstr "trop de pr�f�rences de compression\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "Caract�re invalide dans la cha�ne de pr�f�rences\n"
+msgstr "�l�ment `%s' invalide dans la cha�ne de pr�f�rences\n"
 
 # g10/keygen.c:123 ???
 #: g10/keygen.c:827
@@ -3632,71 +3665,69 @@ msgstr "�criture de l'auto-signature\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
 
 #: g10/keygen.c:1247
-#, fuzzy
 msgid "Sign"
-msgstr "signer"
+msgstr "Signer"
 
 #: g10/keygen.c:1250
-#, fuzzy
 msgid "Encrypt"
-msgstr "chiffrer les donn�es"
+msgstr "Chiffrer"
 
 #: g10/keygen.c:1253
 msgid "Authenticate"
-msgstr ""
+msgstr "Authentifier"
 
 #: g10/keygen.c:1261
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsCcAaQq"
 
 #: g10/keygen.c:1276
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "Actions possibles pour une cl� %s: "
 
 #: g10/keygen.c:1280
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "Actions actuellement permises: "
 
 #: g10/keygen.c:1285
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) Inverser la capacit� de signer\n"
 
 #: g10/keygen.c:1288
-#, fuzzy, c-format
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (chiffrement seul)\n"
+msgstr "   (%c) Inverser la capacit� de chiffrement\n"
 
 #: g10/keygen.c:1291
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) Inverser la capacit� d'authentifier\n"
 
 #: g10/keygen.c:1294
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) Termin�\n"
 
 #: g10/keygen.c:1348
 msgid "Please select what kind of key you want:\n"
 msgstr "S�lectionnez le type de cl� d�sir�:\n"
 
 #: g10/keygen.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA et ElGamal (par d�faut)\n"
+msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
 #: g10/keygen.c:1351
 #, c-format
@@ -3705,90 +3736,60 @@ msgstr "   (%d) DSA (signature seule)\n"
 
 #: g10/keygen.c:1353
 #, 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
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (chiffrement seul)\n"
+msgstr "   (%d) Elgamal (chiffrement seul)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1358
-#, fuzzy, c-format
-msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (chiffrement seul)\n"
-
-#: g10/keygen.c:1409
+#: g10/keygen.c:1360
 #, c-format
-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 ""
-"Pr�paration � la g�n�ration d'une nouvelle paire de cl�s %s.\n"
-"            la taille minimale est  768 bits\n"
-"          la taille par d�faut est 1024 bits\n"
-" la taille maximale conseill�e est 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
+msgid "   (%d) RSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
-"les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Etes-vous s�r de vouloir cette taille ? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Quelle taille de cl� d�sirez-vous ? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"D'accord, mais n'oubliez pas que les radiations de votre �cran et de votre\n"
-"clavier sont aussi tr�s vuln�rables aux attaques !\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3804,7 +3805,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3820,29 +3821,29 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "La signature est valide pour ? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s n'expire pas du tout\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expire le %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3850,13 +3851,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:1577
-#, fuzzy
+#: g10/keygen.c:1589
 msgid "Is this correct? (y/N) "
-msgstr "Est-ce correct (o/n) ? "
+msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1620
-#, fuzzy
+#: g10/keygen.c:1632
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3872,44 +3871,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 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:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3920,28 +3919,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3949,12 +3948,12 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3966,7 +3965,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3978,56 +3977,52 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "La paire de cl�s DSA fera 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
-#, fuzzy, c-format
+#: g10/keygen.c:2761 g10/keygen.c:2899
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "�criture de la cl� secr�te vers `%s'\n"
+msgstr "�criture d'un bout de cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, 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:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, 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:2927
+#: g10/keygen.c:2939
 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:2938
+#: g10/keygen.c:2950
 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"
@@ -4036,13 +4031,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, 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:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4050,7 +4045,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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4058,44 +4053,43 @@ 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
-#, fuzzy
+#: g10/keygen.c:3052 g10/keygen.c:3174
 msgid "Really create? (y/N) "
-msgstr "Cr�er vraiment ? "
+msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3315
-#, fuzzy, c-format
+#: g10/keygen.c:3327
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
+msgstr "le stockage de la cl� dans la carte a �chou�: %s\n"
 
-#: g10/keygen.c:3362
-#, fuzzy, c-format
+#: g10/keygen.c:3374
+#, c-format
 msgid "can't create backup file `%s': %s\n"
-msgstr "impossible de cr�er `%s': %s\n"
+msgstr "impossible de cr�er le fichier de sauvegarde `%s': %s\n"
 
-#: g10/keygen.c:3385
-#, fuzzy, c-format
+#: g10/keygen.c:3397
+#, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
+msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "la longueur du modulo RSA n'est pas %d\n"
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "l'exposant public est trop �lev� (plus de 32 bits)\n"
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
-msgstr ""
+msgstr "la longueur d'un nombre premier RSA n'est pas %d\n"
 
 #: g10/keyid.c:497 g10/keyid.c:509 g10/keyid.c:521 g10/keyid.c:533
 msgid "never     "
@@ -4111,7 +4105,7 @@ msgstr "Politique de signature: "
 
 #: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "Serveur de cl�s critique favori: "
 
 #: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
@@ -4134,39 +4128,38 @@ msgid "Keyring"
 msgstr "Porte-cl�s"
 
 #: g10/keylist.c:729
-#, fuzzy, c-format
+#, c-format
 msgid "expired: %s)"
-msgstr " [expire: %s]"
+msgstr "expir�e: %s)"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
-#, fuzzy
+#: g10/keylist.c:1440 g10/keylist.c:1444
 msgid "      Key fingerprint ="
-msgstr " Empreinte de la cl� ="
+msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "N� de s�rie de la carte ="
 
 #: g10/keyring.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "la construction d'une armure a �chou�: %s \n"
+msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4188,19 +4181,19 @@ msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
 #: g10/keyring.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "v�rification du porte-cl�s `%s'\n"
+msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
 #: g10/keyring.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
+msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
 #: g10/keyring.c:1433
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
+msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
 #: g10/keyring.c:1504
 #, c-format
@@ -4208,140 +4201,140 @@ msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
 #: g10/keyserver.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
-"AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
+"AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
+"utilis�es dans cette plateforme\n"
 
 #: g10/keyserver.c:378
-#, fuzzy
 msgid "disabled"
-msgstr "d�sactiver"
+msgstr "d�sactiv�"
 
 #: g10/keyserver.c:579
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
 #: g10/keyserver.c:662 g10/keyserver.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "options d'export invalides\n"
+msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
 #: g10/keyserver.c:752
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "cl� '%s' introuvable: %s\n"
+msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
 #: g10/keyserver.c:754
-#, fuzzy
 msgid "key not found on keyserver\n"
-msgstr "cl� '%s' introuvable: %s\n"
+msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
 #: g10/keyserver.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "requ�te de la cl� %08lX de %s\n"
+msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
 #: g10/keyserver.c:900
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "requ�te de la cl� %08lX de %s\n"
+msgstr "requ�te de la cl� %s de %s\n"
 
 #: g10/keyserver.c:1045
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "recherche de \"%s\" du serveur HKP %s\n"
+msgstr "envoi de la cl� %s au serveur %s %s\n"
 
 #: g10/keyserver.c:1049
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"�\n"
-"sign� avec votre cl� %08lX � %s\n"
+msgstr "envoi de la cl� %s � %s\n"
 
 #: g10/keyserver.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "recherche de \"%s\" du serveur HKP %s\n"
+msgstr "recherche de � %s � du serveur %s %s\n"
 
 #: g10/keyserver.c:1095
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "recherche de \"%s\" du serveur HKP %s\n"
+msgstr "recherche de � %s � de %s\n"
 
 #: g10/keyserver.c:1102 g10/keyserver.c:1197
-#, fuzzy
 msgid "no keyserver action!\n"
-msgstr "options d'export invalides\n"
+msgstr "pas d'action pour le serveur de cl�s !\n"
 
 #: g10/keyserver.c:1150
 #, 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:1159
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
 #: g10/keyserver.c:1218
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
 #: g10/keyserver.c:1224
 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:1236
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
 #: g10/keyserver.c:1241
 #, 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:1249
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgstr "gpgkeys_%s ne supporte pas le gestionnaire de version %d\n"
 
 #: g10/keyserver.c:1254
-#, fuzzy
 msgid "keyserver timed out\n"
-msgstr "erreur du serveur de cl�s"
+msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
 #: g10/keyserver.c:1259
-#, fuzzy
 msgid "keyserver internal error\n"
-msgstr "erreur du serveur de cl�s"
+msgstr "erreur interne du serveur de cl�s\n"
 
 #: g10/keyserver.c:1268
-#, fuzzy, c-format
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
+msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
 #: g10/keyserver.c:1293 g10/keyserver.c:1327
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
 #: g10/keyserver.c:1578
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
-"AVERTISSEMENT: impossible d'enlever le fichier temporaire\n"
-"(%s) `%s': %s\n"
+"AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
+"via %s: %s\n"
 
 #: g10/keyserver.c:1600
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "requ�te de la cl� %08lX de %s\n"
+msgstr "rafra�chissement d'une cl� depuis %s\n"
 
 #: g10/keyserver.c:1602
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "requ�te de la cl� %08lX de %s\n"
+msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
 #: g10/mainproc.c:248
 #, c-format
@@ -4359,33 +4352,33 @@ msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "chiffr� avec l'algorithme inconnu %d\n"
+msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
 #: g10/mainproc.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "public key is %s\n"
-msgstr "la cl� publique est %08lX\n"
+msgstr "la cl� publique est %s\n"
 
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
 #: g10/mainproc.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "chiffr� avec une cl� de %u bits %s, ID %08lX, cr��e le %s\n"
+msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
 #: g10/mainproc.c:465 g10/pkclist.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "              alias \""
+msgstr "      � %s �\n"
 
 #: g10/mainproc.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "chiffr� avec une cl� %s, %08lX\n"
+msgstr "chiffr� avec une cl� %s, ID %s\n"
 
 #: g10/mainproc.c:483
 #, c-format
@@ -4452,47 +4445,47 @@ msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
 #: g10/mainproc.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s\n"
-msgstr "La signature a expir� le %s\n"
+msgstr "Signature faite le %s\n"
 
 #: g10/mainproc.c:1351
-#, fuzzy, c-format
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "              alias \""
+msgstr "               en utilisant la cl� %s %s\n"
 
 #: g10/mainproc.c:1355
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s using %s key ID %s\n"
-msgstr "Signature faite %.*s avec la cl� %s ID %08lX\n"
+msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
 #: g10/mainproc.c:1375
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
 #: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "MAUVAISE signature de \""
+msgstr "MAUVAISE signature de � %s �"
 
 #: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "Signature expir�e de \""
+msgstr "Signature expir�e de � %s �"
 
 #: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "Bonne signature de \""
+msgstr "Bonne signature de � %s �"
 
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
 msgstr "[incertain]"
 
 #: g10/mainproc.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "                aka \"%s\""
-msgstr "              alias \""
+msgstr "                alias � %s �"
 
 #: g10/mainproc.c:1662
 #, c-format
@@ -4517,7 +4510,7 @@ msgstr "binaire"
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "inconnu"
 
@@ -4551,30 +4544,42 @@ 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:101
+#: g10/misc.c:105
 #, 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:121 g10/misc.c:149 g10/misc.c:221
-#, fuzzy, c-format
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "impossible d'ouvrir le fichier: %s\n"
+msgstr "fstat de `%s' �chou� dans %s: %s\n"
 
-#: g10/misc.c:186
-#, fuzzy, c-format
+#: g10/misc.c:190
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "base de confiance: la lecture a �chou� (n=%d): %s\n"
+msgstr "fstat(%d) �chou� dans %s: %s\n"
+
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algorithme de chiffrement non implant�"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
-"plus standard !\n"
+"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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4603,12 +4608,11 @@ msgstr "utilisez \"%s%s\" � la place\n"
 
 #: g10/misc.c:681
 msgid "Uncompressed"
-msgstr "D�compress�"
+msgstr "Non-compress�"
 
 #: g10/misc.c:706
-#, fuzzy
 msgid "uncompressed|none"
-msgstr "D�compress�"
+msgstr "noncompress�|non"
 
 #: g10/misc.c:816
 #, c-format
@@ -4616,14 +4620,14 @@ msgid "this message may not be usable by %s\n"
 msgstr "ce message ne sera pas utilisable par %s\n"
 
 #: g10/misc.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "lire les options de `%s'\n"
+msgstr "option ambigu� `%s'\n"
 
 #: g10/misc.c:998
-#, fuzzy, c-format
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "r�cipient par d�faut `%s' inconnu\n"
+msgstr "option `%s' inconnue\n"
 
 #: g10/openfile.c:84
 #, c-format
@@ -4631,9 +4635,8 @@ msgid "File `%s' exists. "
 msgstr "Le fichier `%s' existe. "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "R��crire (o/N)? "
+msgstr "R��crire par-dessus ? (o/N) "
 
 #: g10/openfile.c:119
 #, c-format
@@ -4665,9 +4668,9 @@ msgstr ""
 "AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
 
 #: g10/openfile.c:409
-#, fuzzy, c-format
+#, c-format
 msgid "directory `%s' created\n"
-msgstr "%s: r�pertoire cr��\n"
+msgstr "r�pertoire `%s' cr��\n"
 
 #: g10/parse-packet.c:119
 #, c-format
@@ -4685,119 +4688,117 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "impossible d'obtenir le pid du client pour l'agent\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur de lecture du serveur\n"
 "pour l'agent\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 "impossible d'obtenir le descripteur d'�criture du serveur pour l'agent\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�me de communication avec ssh-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 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:684 g10/passphrase.c:1160
-#, fuzzy, c-format
+#: g10/passphrase.c:698 g10/passphrase.c:1203
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (ID cl� principale %08lX)"
+msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:698
-#, fuzzy, c-format
+#: g10/passphrase.c:712
+#, 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 ""
-"Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
-"l'utilisateur:\n"
+"Vous avez besoin d'un mot de passe pour d�verrouiller la cl�\n"
+"secr�te pour l'utilisateur:\n"
 "\"%.*s\"\n"
-"cl� %u bits %s, ID %08lX, cr��e %s%s\n"
+"cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "mot de passe trop long\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "r�ponse de l'agent invalide\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
-#, fuzzy
-msgid "can't query password in batch mode\n"
-msgstr "impossible de demander un mot de passe en mode automatique\n"
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
+msgid "can't query passphrase in batch mode\n"
+msgstr "impossible de demander la phrase de passe en mode automatique\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:1141
-#, fuzzy, c-format
+#: g10/passphrase.c:1184
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
-"Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
-"l'utilisateur: \""
+"Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
+"cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:1147
-#, fuzzy, c-format
+#: g10/passphrase.c:1190
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
+msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "        (sous-cl� de la cl� principale ID %s)"
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
@@ -4821,24 +4822,23 @@ msgid "Enter JPEG filename for photo ID: "
 msgstr "Entrez le nom du fichier JPEG pour la photo d'identit�: "
 
 #: g10/photoid.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "impossible d'ouvrir le fichier: %s\n"
+msgstr "impossible d'ouvrir le fichier JPEG `%s': %s\n"
 
 #: g10/photoid.c:102
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
-msgstr ""
+msgstr "Ce JPEG est vraiment tr�s grand (%d octets) !\n"
 
 #: g10/photoid.c:104
-#, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
+msgstr "�tes-vous s�r de vouloir l'utiliser ? (o/N) "
 
 #: g10/photoid.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "� %s � n'est pas un fichier JPEG\n"
+msgstr "`%s' n'est pas un fichier JPEG\n"
 
 #: g10/photoid.c:136
 msgid "Is this photo correct (y/N/q)? "
@@ -4881,52 +4881,47 @@ msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
 #: g10/pkclist.c:213
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"Pas de confiance d�finie pour :\n"
-"%4u%c/%08lX %s \""
+msgstr "Pas de valeur de confiance d�finie pour :\n"
 
 #: g10/pkclist.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "              alias \""
+msgstr "  alias � %s �\n"
 
 #: g10/pkclist.c:255
-#, fuzzy
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
-msgstr "Cette cl� appartient probablement � son propri�taire\n"
+msgstr ""
+"Jusqu'� quel point avez-vous confiance au fait que cette cl�\n"
+"appartient r��llement � l'utilisateur nomm� ?\n"
 
 #: g10/pkclist.c:270
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I don't know or won't say\n"
-msgstr " %d = ne sait pas\n"
+msgstr "  %d = ne sais pas ou ne dirai pas\n"
 
 #: g10/pkclist.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = je ne fais PAS confiance\n"
+msgstr "  %d = je ne fais PAS confiance\n"
 
 #: g10/pkclist.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = je donne une confiance ultime\n"
+msgstr "  %d = je donne une confiance ultime\n"
 
 #: g10/pkclist.c:284
-#, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " m = retour au menu principal\n"
+msgstr "  m = retour au menu principal\n"
 
 #: g10/pkclist.c:287
-#, fuzzy
 msgid "  s = skip this key\n"
-msgstr " s = sauter cette cl�\n"
+msgstr "  s = sauter cette cl�\n"
 
 #: g10/pkclist.c:288
-#, fuzzy
 msgid "  q = quit\n"
-msgstr " q = quitter\n"
+msgstr "  q = quitter\n"
 
 #: g10/pkclist.c:292
 #, c-format
@@ -4934,55 +4929,57 @@ msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
 msgstr ""
+"Le niveau de confiance minimal pour cette cl� est: %s\n"
+"\n"
 
 #: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
 #: g10/pkclist.c:319
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ?"
+msgstr "Voulez-vous vraiment donner une confiance ultime � cette cl� ? (o/N) "
 
 #: g10/pkclist.c:333
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime:\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: Rien ne dit que la cl� appartient vraiment au propri�taire.\n"
+msgstr ""
+"%s: Rien ne dit que la cl� appartient vraiment � l'utilisateur\n"
+"nomm�.\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: Rien ne dit que la cl� appartient vraiment au propri�taire.\n"
+msgstr ""
+"%s: Il n'est pas vraiment s�r que la cl� appartient vraiment\n"
+"� l'utilisateur nomm�.\n"
 
 #: g10/pkclist.c:429
-#, fuzzy
 msgid "This key probably belongs to the named user\n"
-msgstr "Cette cl� appartient probablement � son propri�taire\n"
+msgstr "Cette cl� appartient probablement � l'utilisateur nomm�\n"
 
 #: g10/pkclist.c:434
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\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 ""
-"Il n'est PAS certain que la cl� appartient � sos propri�taire.\n"
-"Si vous savez *vraiment* ce que vous faites, vous pouvez r�pondre\n"
-"oui � la prochaine question\n"
+"Il n'est PAS certain que la cl� appartient � la personne nom�e dans\n"
+"le nom d'utilisateur. Si vous savez *vraiment* ce que vous faites,\n"
+"vous pouvez r�pondre oui � la prochaine question.\n"
 "\n"
 
 #: g10/pkclist.c:467
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "Utiliser cette cl� quand m�me ? "
+msgstr "Utiliser cette cl� quand m�me ? (o/N) "
 
 #: g10/pkclist.c:501
 msgid "WARNING: Using untrusted key!\n"
@@ -5003,7 +5000,7 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION: Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+msgid "         This could mean that the signature is forged.\n"
 msgstr "           Cela pourrait signifier que la signature est fausse.\n"
 
 #: g10/pkclist.c:527
@@ -5068,7 +5065,7 @@ msgstr ""
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "R�cipients actuels:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -5084,7 +5081,7 @@ msgstr "Pas d'utilisateur de ce nom.\n"
 
 #: g10/pkclist.c:849 g10/pkclist.c:911
 msgid "skipped: public key already set as default recipient\n"
-msgstr "ignor�: la cl� publique est d�j� le r�cipient par d�faut\n"
+msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
 #: g10/pkclist.c:867
 msgid "Public key is disabled.\n"
@@ -5095,9 +5092,9 @@ msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
 #: g10/pkclist.c:903
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "r�cipient par d�faut `%s' inconnu\n"
+msgstr "destinataire par d�faut � %s � inconnu\n"
 
 #: g10/pkclist.c:948
 #, c-format
@@ -5114,40 +5111,40 @@ msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
 #: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "destinataire anonyme; essai de la cl� secr�te %08lX...\n"
+msgstr "destinataire anonyme; essai de la cl� secr�te %s...\n"
 
 #: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "d'accord, nous sommes le r�cipient anonyme.\n"
+msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
 #: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
@@ -5159,16 +5156,16 @@ msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
 #: g10/pubkey-enc.c:266
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
-"NOTE: l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
-"pr�f�rences\n"
+"AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas �t� trouv�\n"
+"dans les pr�f�rences du destinataire\n"
 
 #: g10/pubkey-enc.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: secret key %s expired at %s\n"
-msgstr "NOTE: la cl� secr�te %08lX a expir� le %s\n"
+msgstr "NOTE: la cl� secr�te %s a expir� le %s\n"
 
 #: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
@@ -5181,9 +5178,9 @@ msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
 
 #: g10/revoke.c:146
-#, fuzzy, c-format
+#, c-format
 msgid "key %s has no user IDs\n"
-msgstr "cl� %08lX: pas de nom d'utilisateur\n"
+msgstr "cl� %s: pas de nom d'utilisateur\n"
 
 #: g10/revoke.c:272
 msgid "To be revoked by:\n"
@@ -5194,9 +5191,8 @@ msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une cl� de r�vocation sensible)\n"
 
 #: g10/revoke.c:280
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? "
+msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
@@ -5212,14 +5208,14 @@ msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
 #: g10/revoke.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "aucune cl� de r�vocation trouv�e pour `%s'\n"
+msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
 #: g10/revoke.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "la cl� secr�te `%s' n'a pas �t� trouv�e: %s\n"
+msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
 #: g10/revoke.c:461
 #, c-format
@@ -5231,9 +5227,8 @@ msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
 #: g10/revoke.c:479
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? "
+msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
 #: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
@@ -5290,9 +5285,8 @@ msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
 #: g10/revoke.c:680
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "Est-ce d'accord ? "
+msgstr "Est-ce d'accord ? (o/N) "
 
 #: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
@@ -5304,9 +5298,9 @@ msgid "protection algorithm %d%s is not supported\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
 #: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "l'algorithme de protection %d%s n'est pas support�\n"
+msgstr "le hachage de protection %d n'est pas support�\n"
 
 #: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
@@ -5347,70 +5341,68 @@ msgid "WARNING: signature digest conflict in message\n"
 msgstr "AVERTISSEMENT: conflit de hachage de signature dans le message\n"
 
 #: g10/sig-check.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr ""
-"AVERTISSEMENT: la sous-cl� de signature %08lX n'a pas de certificat\n"
+"AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
 #: g10/sig-check.c:102
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"AVERTISSEMENT: la sous-cl� de signature %08lX a un certificat crois�\n"
+"AVERTISSEMENT: la sous-cl� de signature %s a un certificat crois�\n"
 "invalide\n"
 
 #: g10/sig-check.c:168
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu second newer than the signature\n"
-msgstr ""
-"la cl� publique %08lX est plus r�cente de %lu seconde que la signature\n"
+msgstr "la cl� publique %s est plus r�cente de %lu seconde que la signature\n"
 
 #: g10/sig-check.c:169
-#, fuzzy, c-format
+#, c-format
 msgid "public key %s is %lu seconds newer than the signature\n"
-msgstr ""
-"la cl� publique %08lX est plus r�cente de %lu secondes que la signature\n"
+msgstr "la cl� publique %s est plus r�cente de %lu secondes que la signature\n"
 
 # on s'amuse comme on peut...
 #: 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 ""
-"la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
-"probl�me d'horloge)\n"
+"la cl� %s a �t� cr��e %lu seconde dans le futur (rupture\n"
+"spatio-temporelle ou probl�me d'horloge)\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 ""
-"la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
-"probl�me d'horloge\n"
+"la cl� %s a �t� cr��e %lu secondes dans le futur (rupture\n"
+"spatio-temporelle ou probl�me d'horloge)\n"
 
 #: g10/sig-check.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "NOTE: la cl� de signature %08lX a expir� le %s\n"
+msgstr "NOTE: la cl� de signature %s a expir� le %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 ""
-"la signature de la cl� %08lX est suppos�e �tre fausse car un bit\n"
+"la signature de la cl� %s est suppos�e �tre fausse car un bit\n"
 "critique est inconnu\n"
 
 #: g10/sig-check.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "cl� %08lX: pas de sous-cl� pour le paquet de r�vocation de sous-cl�\n"
+msgstr "cl� %s: pas de sous-cl� pour la signature de r�vocation de sous-cl�\n"
 
 #: g10/sig-check.c:558
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr ""
-"cl� %08lX: pas de sous-cl� pour la signature de liaison � la\n"
+"cl� %s: pas de sous-cl� pour la signature de liaison � la\n"
 "sous-cl�\n"
 
 #: g10/sign.c:85
@@ -5445,20 +5437,20 @@ msgstr ""
 "(de style 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 ""
-"AVERTISSEMENT: impossible de faire une expansion � base de %% de l'url\n"
+"AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
 #: g10/sign.c:187
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr ""
-"AVERTISSEMENT: impossible de faire une expansion � base de %% de l'url\n"
+"AVERTISSEMENT: impossible de faire une expansion � base de %% de l'URL\n"
 "de politique (trop grande). Utilisation de la version non expans�e.\n"
 
 #: g10/sign.c:364
@@ -5467,9 +5459,9 @@ msgid "checking created signature failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 
 #: g10/sign.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "Signature %s de: \"%s\"\n"
+msgstr "%s/%s signature de: � %s �\n"
 
 #: g10/sign.c:741
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
@@ -5477,60 +5469,54 @@ msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "�criture de `%s'\n"
-
-#: g10/sign.c:807
-#, fuzzy, c-format
+#: g10/sign.c:808
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
-"forcer l'algorithme de chiffrement %s (%d) entre en d�saccord avec\n"
-"les pr�f�rences du r�cipient\n"
+"AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
+"d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:158
-#, fuzzy, c-format
+#: g10/skclist.c:157
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "`%s' a �t� ignor�: dupliqu�\n"
+msgstr "� %s � a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
-#, fuzzy, c-format
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "`%s' a �t� ignor�: %s\n"
+msgstr "� %s � a �t� ignor�: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:186
-#, fuzzy
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
-"`%s' a �t� ignor�e: c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas\n"
-"s�re pour les signatures !\n"
+"c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas s�re pour\n"
+"les signatures !"
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
 #, c-format
@@ -5547,38 +5533,37 @@ msgstr ""
 "# (Utilisez � gpg --import-ownertrust � pour les restaurer)\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 "erreur pendant la lecture de `%s': %s\n"
+msgstr "erreur dans `%s': %s\n"
 
 #: g10/tdbdump.c:159
-#, fuzzy
 msgid "line too long"
-msgstr "ligne trop longue\n"
+msgstr "ligne trop longue"
 
 #: g10/tdbdump.c:167
 msgid "colon missing"
-msgstr ""
+msgstr "symbole deux-points manquant"
 
 #: g10/tdbdump.c:173
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "erreur: empreinte invalide\n"
+msgstr "empreinte invalide"
 
 #: g10/tdbdump.c:178
-#, fuzzy
 msgid "ownertrust value missing"
-msgstr "importer les indices de confiance"
+msgstr "valeur de confiance au propri�taire manquante"
 
 #: g10/tdbdump.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "erreur pendant la recherche de l'enregistrement de confiance: %s\n"
+msgstr ""
+"erreur pendant la recherche de l'enregistrement de confiance\n"
+"dans `%s': %s\n"
 
 #: g10/tdbdump.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "erreur de lecture: %s\n"
+msgstr "erreur de lecture dans `%s': %s\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
@@ -5601,9 +5586,9 @@ msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop volumineuse\n"
 
 #: g10/tdbio.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "impossible de fermer `%s': %s\n"
+msgstr "impossible d'acc�der � `%s': %s\n"
 
 #: g10/tdbio.c:512
 #, c-format
@@ -5611,14 +5596,14 @@ msgid "%s: directory does not exist!\n"
 msgstr "%s: le r�pertoire n'existe pas !\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 "impossible de cr�er `%s': %s\n"
+msgstr "impossible de cr�er un verrou pour `%s'\n"
 
 #: g10/tdbio.c:524 g10/tdbio.c:591
-#, fuzzy, c-format
+#, c-format
 msgid "can't lock `%s'\n"
-msgstr "impossible d'ouvrir `%s'\n"
+msgstr "impossible de verrouiller `%s'\n"
 
 #: g10/tdbio.c:550
 #, c-format
@@ -5716,12 +5701,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
@@ -5732,24 +5717,24 @@ msgid "`%s' is not a valid long keyID\n"
 msgstr "`%s' n'est pas une identification de cl� longue valide\n"
 
 #: g10/trustdb.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "cl� %08lX: accept�e comme cl� de confiance.\n"
+msgstr "cl� %s: accept�e comme cl� de confiance.\n"
 
 #: g10/trustdb.c:295
-#, fuzzy, c-format
+#, c-format
 msgid "key %s occurs more than once in the trustdb\n"
-msgstr "la cl� %08lX appara�t plusieurs fois dans la base de confiance\n"
+msgstr "la cl� %s appara�t plusieurs fois dans la base de confiance\n"
 
 #: g10/trustdb.c:310
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr "cl� %08lX: pas de cl� publique pour la cl� de confiance - ignor�e\n"
+msgstr "cl� %s: pas de cl� publique pour la cl� de confiance - ignor�e\n"
 
 #: g10/trustdb.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "cl� marqu�e comme ayant une confiance ultime.\n"
+msgstr "cl� %s marqu�e comme ayant une confiance ultime.\n"
 
 #: g10/trustdb.c:344
 #, c-format
@@ -5767,94 +5752,142 @@ msgstr "l'enregistrement de confiance %lu: n'est pas du type demand� %d\n"
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
+"impossible d'utiliser ce mod�le de confiance inconnu (%d) -\n"
+"on utilise � la place le mod�le de confiance %s\n"
 
 #: g10/trustdb.c:452
 #, c-format
 msgid "using %s trust model\n"
+msgstr "utilisation du mod�le de confiance %s\n"
+
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:501
-msgid "undefined"
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "revoqu�e"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "expir�e"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "inconnu"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+#, fuzzy
+msgid "[marginal]"
+msgstr "marginale"
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:515
 #, fuzzy
+msgid "[ultimate]"
+msgstr "ultime"
+
+#: g10/trustdb.c:530
+msgid "undefined"
+msgstr "ind�fini"
+
+#: g10/trustdb.c:531
 msgid "never"
-msgstr "jamais    "
+msgstr "jamais"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
-msgstr ""
+msgstr "marginale"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
-msgstr ""
+msgstr "pleine"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
-msgstr ""
+msgstr "ultime"
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
 
-#: g10/trustdb.c:560
-#, fuzzy, c-format
+#: g10/trustdb.c:589
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "v�rification de la base de confiance inutile\n"
+msgstr ""
+"v�rification de la base de confiance inutile avec le mod�le de\n"
+"confiance `%s'\n"
 
-#: g10/trustdb.c:575
-#, fuzzy, c-format
+#: g10/trustdb.c:604
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "v�rification de la base de confiance inutile\n"
+msgstr ""
+"mise � jour de la base de confiance inutile avec le mod�le de\n"
+"confiance `%s'\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
-#, fuzzy, c-format
+#: g10/trustdb.c:822 g10/trustdb.c:1260
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "cl� publique %08lX non trouv�e : %s\n"
+msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:1934
-#, fuzzy, c-format
+#: g10/trustdb.c:1963
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "la cl� publique de la cl� de confiace ultime %08lX est introuvable\n"
+msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
+"%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
+"de confiance %s\n"
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"profondeur: %d  valide: %3d  sign�: %3d\n"
+"confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2118
-#, fuzzy, c-format
+#: g10/trustdb.c:2147
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "enregistrement de confiance %lu, type %d: l'�criture a �chou�: %s\n"
+msgstr ""
+"impossible de mettre � jour l'enregistrement de version de la\n"
+"base de confiance: l'�criture a �chou�: %s\n"
 
 #: g10/verify.c:116
 msgid ""
@@ -6082,22 +6115,20 @@ msgid "keyserver error"
 msgstr "erreur du serveur de cl�s"
 
 #: util/errors.c:108
-#, fuzzy
 msgid "canceled"
-msgstr "Annuler"
+msgstr "annul�"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "non chiffr�"
+msgstr "pas de carte"
 
 #: util/logger.c:157
 msgid "ERROR: "
-msgstr ""
+msgstr "ERREUR: "
 
 #: util/logger.c:160
 msgid "WARNING: "
-msgstr ""
+msgstr "AVERTISSEMENT: "
 
 #: util/logger.c:223
 #, c-format
@@ -6131,20 +6162,19 @@ msgstr "qQ"
 
 #: util/miscutil.c:384
 msgid "okay|okay"
-msgstr ""
+msgstr "ok|ok"
 
 #: util/miscutil.c:386
 msgid "cancel|cancel"
-msgstr ""
+msgstr "annuler|annuler"
 
 #: util/miscutil.c:387
 msgid "oO"
-msgstr ""
+msgstr "oO"
 
 #: util/miscutil.c:388
-#, fuzzy
 msgid "cC"
-msgstr "c"
+msgstr "aA"
 
 #: util/secmem.c:90
 msgid "WARNING: using insecure memory!\n"
@@ -6164,467 +6194,61 @@ 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 "sorry, can't do this in batch mode\n"
-#~ msgstr "d�sol�, impossible de faire cela en mode automatique\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "cl� '%s' introuvable: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "impossible de cr�er `%s': %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "impossible d'ouvrir le fichier: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "              alias \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = donnez-moi plus d'informations\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "cl� %08lX: la cl� a �t� r�voqu�e !\n"
-
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "cl� %08lX: la sous-cl� a �t� r�voqu�e !\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: la cl� a expir�\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: Nous ne faisons PAS confiance � cette cl�\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (signature et chiffrement)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (signature seule)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (signature et chiffrement)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (chiffrement seul)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (signature et chiffrement)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: impossible d'ouvrir: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: ATTENTION: fichier vide\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "impossible d'ouvrir %s: %s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = je crois marginalement\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = je fais enti�rement confiance\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
-#~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
-#~ msgstr ""
-#~ "\"\n"
-#~ "sign� localement avec votre cl� %08lX � %s\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   sign� par %08lX � %s%s\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: impossible d'acc�der: %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: impossible de cr�er le verrouillage\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: impossible de cr�er le verrou\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: impossible de cr�er: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: impossible de cr�er le r�pertoire: %s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr ""
-#~ "Si vous voulez utiliser cette cl� r�voqu�e quand-m�me, r�pondez �oui�."
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "Impossible d'ouvrir la photo � %s �: %s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "impossible d'ouvrir le fichier: %s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "erreur: symbole deux-points manquant\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "erreur: pas de valeur de confiance au propri�taire\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (ID cl� principale %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! la sous-cl� a �t� r�voqu�e: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- une r�vocation truqu�e a �t� trouv�e\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? probl�me de v�rification de la r�vocation: %s\n"
-
-#~ msgid "[revoked] "
-#~ msgstr "[revoqu�e] "
-
-#~ msgid "[expired] "
-#~ msgstr "[expir�e] "
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [expire: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [expire: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[revoqu�e] "
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "impossible de cr�er %s: %s\n"
-
-#~ msgid ""
-#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
-#~ msgstr ""
-#~ "AVERTISSEMENT: l'algorithme de hachage `%s' ne fait pas partie\n"
-#~ "d'OpenPGP. Son utilisation est � vos risques et p�rils !\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[fichiers]|chiffrer les fichiers"
-
-#~ msgid "store only"
-#~ msgstr "pas d'action"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[fich.]|d�chiffrer les fichiers"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "signer une cl� irr�vocablement"
-
-#~ msgid "sign a key locally and non-revocably"
-#~ msgstr "signer une cl� localement et irr�vocablement"
-
-#~ msgid "list only the sequence of packets"
-#~ msgstr "ne lister que les paquets"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr "exporter les indices de confiance"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "mise � jour inattendue de la base de confiance"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "r�parer une base de confiance corrompue"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr ""
-#~ "Enlever l'armure d'un fichier ou de\n"
-#~ "l'entr�e standard"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr ""
-#~ "Mettre une armure � un fichier ou �\n"
-#~ "l'entr�e standard"
-
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "utiliser la cl� par d�f. comme r�cipient"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "ne pas utiliser du tout le terminal"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "forcer les signatures en v3"
-
-#~ msgid "do not force v3 signatures"
-#~ msgstr "ne pas forcer les signatures en v3"
-
-#~ msgid "force v4 key signatures"
-#~ msgstr "forcer les signatures en v4"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "ne pas forcer les signatures en v4"
-
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "toujours utiliser un sceau pour le chiffrement"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr ""
-#~ "ne jamais utiliser de sceau pour le\n"
-#~ "chiffrement"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "utiliser gpg-agent"
-
-#~ msgid "batch mode: never ask"
-#~ msgstr "mode automatique: ne jamais rien demander"
-
-#~ msgid "assume yes on most questions"
-#~ msgstr "r�pondre oui � la plupart des questions"
-
-#~ msgid "assume no on most questions"
-#~ msgstr "r�pondre non � la plupart des questions"
-
-#~ msgid "add this keyring to the list of keyrings"
-#~ msgstr "ajouter ce porte-cl�s � la liste"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "ajouter ce porte-cl�s secret � la liste"
-
-#~ msgid "show which keyring a listed key is on"
-#~ msgstr "indiquer o� est une cl� list�e"
-
-#~ msgid "|NAME|use NAME as default secret key"
-#~ msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
-
-#~ msgid "|HOST|use this keyserver to lookup keys"
-#~ msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr "|NOM|le terminal utilise la table de caract�res NOM"
-
-#~ msgid "read options from file"
-#~ msgstr "lire les options du fichier"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr "|[fichier]|�crire les informations d'�tat vers ce fichier"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|IDCL�|donner une confiance ultime � cette cl�"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr "|FICH|charger le module d'extension FICH"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr "imiter le mode d�crit dans la RFC1991"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr "utiliser le comportement d�fini par OpenPGP"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr ""
-#~ "utiliser le comportement de PGP 2.x\n"
-#~ "pour toutes les options de paquets,\n"
-#~ "de hachage et de chiffrement"
-
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|coder les mots de passe suivant le mode N"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
-
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
-
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr "|NOM|utiliser la fonction de hachage NOM"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|utiliser l'algorithme de compression N"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "supprimer l'ident. des paquets chiffr�s"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "Montrer les photos d'identit�"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "Ne pas montrer les photos d'identit�"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr ""
-#~ "Choisir la ligne de commande servant �\n"
-#~ "afficher les photos d'identit�"
-
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ msgstr ""
-#~ "l'algorithme de compression `%s' ne fonctionne qu'en lecture pour\n"
-#~ "cette version\n"
+#~ "l'algorithme de hachage `%s' ne marche qu'en lecture seule dans cette\n"
+#~ "version\n"
 
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr ""
-#~ "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
+#~ msgid "[%8.8s] "
+#~ msgstr "[%8.8s] "
 
 #~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
+#~ "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 ""
-#~ "%08lX: Il n'est pas s�r que cette cl� appartient vraiment � son\n"
-#~ "propri�taire mais elle est quand m�me accept�e\n"
-
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "la pr�f�rence %c%lu n'est pas valide\n"
+#~ "Pr�paration � la g�n�ration d'une nouvelle paire de cl�s %s.\n"
+#~ "            la taille minimale est  768 bits\n"
+#~ "          la taille par d�faut est 1024 bits\n"
+#~ " la taille maximale conseill�e est 2048 bits\n"
 
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "cl� %08lX: ce n'est pas une cl� rfc2440 - ignor�e\n"
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 #~ msgstr ""
-#~ "NOTE: Cl� principale Elgamal d�tect�e - l'importation peut prendre un\n"
-#~ "certain temps\n"
-
-#~ msgid " (default)"
-#~ msgstr " (par d�faut)"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  cr��e: %s expire: %s"
-
-#~ msgid "Notation: "
-#~ msgstr "Notation: "
-
-#~ msgid "Policy: "
-#~ msgstr "Politique: "
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "impossible d'obtenir les cl�s du serveur: %s\n"
-
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "erreur pendant l'envoi de `%s': %s\n"
+#~ "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "l'envoi � `%s' s'est d�roul� avec succ�s (r�sultat=%u)\n"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "l'envoi � `%s' a �chou�: le r�sultat est %u\n"
-
-#~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "ce serveur de cl�s ne supporte pas --search-keys\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "impossible de chercher une cl� dans le serveur : %s\n"
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "taille trop importante; %d est la plus grande valeur permise.\n"
 
 #~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
 #~ msgstr ""
-#~ "cl� %08lX: ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS\n"
-#~ "s�re pour les signatures !\n"
+#~ "Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
+#~ "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-# on s'amuse comme on peut...
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr ""
-#~ "la cl� %08lX a �t� cr��e %lu seconde dans le futur (rupture\n"
-#~ "spatio-temporelle ou probl�me d'horloge)\n"
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Etes-vous s�r de vouloir cette taille de cl� ? (o/N) "
 
 #~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
 #~ msgstr ""
-#~ "la cl� %08lX a �t� cr��e %lu secondes dans le futur (rupture\n"
-#~ "spatio-temporelle ou probl�me d'horloge\n"
+#~ "D'accord, mais n'oubliez pas que les radiations de votre �cran et de "
+#~ "votre\n"
+#~ "clavier sont aussi tr�s vuln�rables aux attaques !\n"
 
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "cl� %08lX marqu�e comme ayant une confiance ultime.\n"
-
-#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-#~ msgstr ""
-#~ "la signature de la cl� de signature Elgamal %08lX pour %08lX a �t�\n"
-#~ "ignor�e\n"
-
-#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-#~ msgstr ""
-#~ "la signature de %08lX pour la cl� de signature Elgamal %08lX a �t�\n"
-#~ "ignor�e\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr ""
-#~ "v�rification � la profondeur %d sign�=%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 ""
-#~ "S�lectionnez l'algorithme � utiliser.\n"
-#~ "DSA (alias DSS) est l'algorithme de signatures �lectroniques qui ne peut\n"
-#~ "�tre utilis� que pour les signatures. C'est l'algorithme recommand� car\n"
-#~ "la v�rification des signatures DSA est beaucoup plus rapide que celle "
-#~ "des\n"
-#~ "signatures ElGamal.\n"
-#~ "\n"
-#~ "ElGamal est un algorithme pouvant � la fois �tre utilis� pour les\n"
-#~ "signatures et le chiffrement. OpenPGP en distingue deux sortes:\n"
-#~ "l'une destin�e uniquement au chiffrement et l'autre pouvant aussi bien\n"
-#~ "servir aux signatures ; elles sont en fait identiques mais certains\n"
-#~ "param�tres doivent �tre sp�cialement choisis pour que la cl� g�n�re des\n"
-#~ "signatures s�res: ce programme est capable de le faire mais les autres\n"
-#~ "implantations de OpenPGP ne sont pas oblig�es d'accepter cette forme de\n"
-#~ "cl�.\n"
-#~ "\n"
-#~ "La premi�re cl� (cl� principale) doit toujours �tre capable de signer ;\n"
-#~ "c'est pourquoi la cl� ElGamal de chiffrement seul est alors d�sactiv�e."
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Les algorithmes exp�rimentaux ne devraient pas �tre utilis�s !\n"
 
 #~ 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."
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
 #~ msgstr ""
-#~ "Bien que ces cl�s soient d�finies dans la RFC2440 elles ne sont pas\n"
-#~ "conseill�es car tous les programmes ne les supportent pas et les\n"
-#~ "signatures cr��es avec elles sont plut�t longues et tr�s lentes � "
-#~ "v�rifier."
-
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "%lu cl�s trait�es jusqu'ici (%lu signatures)\n"
-
-#~ msgid "key incomplete\n"
-#~ msgstr "cl� incompl�te\n"
-
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "cl� %08lX incompl�te\n"
+#~ "Cet algorithme de chiffrement est d�conseill�; utilisez-en un\n"
+#~ "plus standard !\n"
diff --git a/po/gl.po b/po/gl.po
index 97fe6d719..4a570593d 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -14,11 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "o algoritmo de resumo `%s' � de s� lectura nesta versi�n\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -33,11 +28,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -70,9 +66,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "non se pode crear `%s': %s\n"
@@ -128,90 +124,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro ao ler un rexistro libre: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' xa est� comprimido\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "xerar un novo par de chaves"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "fallou o borrado do bloque de chaves: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -299,15 +355,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
@@ -315,141 +371,150 @@ msgstr "�A s�a selecci�n? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -457,233 +522,257 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "abandonar"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "s"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "axuda"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "listar"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depurar"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "erro xeral"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Introduza o ID de usuario: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Introduza o ID de usuario: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repita o contrasinal: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -693,13 +782,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -743,7 +832,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -762,7 +851,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -790,7 +879,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -895,28 +984,28 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
@@ -1095,15 +1184,15 @@ msgstr "non facer ning�n cambio"
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1111,7 +1200,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1131,17 +1220,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 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:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1151,7 +1240,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1159,465 +1248,465 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, 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:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 #, 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:2713
+#: g10/g10.c:2746
 #, 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, 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:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-de-usuario"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-de-usuario"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1625,23 +1714,23 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 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:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1650,29 +1739,29 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
@@ -2024,389 +2113,389 @@ msgstr "Non hai axuda dispo�ible"
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, 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:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, 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:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, 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:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, 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:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@ -2640,7 +2729,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, 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
@@ -2713,7 +2803,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2744,7 +2834,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
@@ -3225,83 +3315,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revocada] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3309,7 +3383,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revocada] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3317,7 +3403,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3326,47 +3412,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3376,165 +3462,165 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con �ndice %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3577,12 +3663,12 @@ msgstr "escribindo a propia sinatura\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
@@ -3650,90 +3736,60 @@ msgstr "   (%d) DSA (s� asinar)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (s� cifrar)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (s� cifrar)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Hase crear unh novo par de chaves %s.\n"
-"             tama�o de chave m�nimo:  768 bits\n"
-"        tama�o de chave por defecto: 1024 bits\n"
-" tama�o de chave m�ximo recomendado: 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "�Qu� tama�o de chave quere? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA s� admite tama�os entre 512 e 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "chave pequena de m�is; 1024 � o menor valor admitido para RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "chave grande de m�is; %d � o maior tama�o admitido.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"�As chaves maiores de 2048 bits non se aconsellan porque\n"
-"os c�lculos levan MOITO tempo!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "�Est� seguro de que quere este tama�o de chave? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "�Qu� tama�o de chave quere? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"De acordo, �pero te�a en conta que a radiaci�n do monitor e o teclado tam�n "
-"son vulnerables a ataques!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tama�o de chave requerido son %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3749,7 +3805,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3765,29 +3821,29 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3795,12 +3851,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3817,44 +3873,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3865,28 +3921,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3894,12 +3950,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3911,7 +3967,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3923,54 +3979,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "O par de chaves DSA ha ter 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, 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:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 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:2938
+#: g10/keygen.c:2950
 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"
@@ -3979,12 +4031,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3992,7 +4044,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4000,40 +4052,40 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4079,28 +4131,28 @@ msgstr "Chaveiro"
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4453,7 +4505,7 @@ msgstr "binario"
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "desco�ecido"
 
@@ -4485,32 +4537,43 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "non � posible deshabilita-los volcados de 'core': %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, 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:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "�Os algoritmos experimentais non deber�an ser usados!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritmo de cifrado non implementado"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is "
-"est�ndar!\n"
+"forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4619,50 +4682,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "non se pode estabrece-lo pid do cliente para o axente\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "non se pode obte-lo FD de lectura do servidor para o axente\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "non se pode obte-lo FD de escritura do servidor para o axente\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4673,41 +4736,41 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "contrasinal demasiado longo\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "resposta do axente non v�lida\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4717,17 +4780,17 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
@@ -4936,7 +4999,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a sinatura est� falsificada.\n"
 
 #: g10/pkclist.c:527
@@ -5041,28 +5105,28 @@ msgstr "non hai enderezos v�lidos\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
@@ -5391,52 +5455,47 @@ msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "escribindo a `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
 "n�meros aleatorios falso\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5627,12 +5686,12 @@ msgstr ""
 "a base de datos de confianza est� corrompida; execute \"gpg --fix-trustdb"
 "\".\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "a li�a de entrada cont�n m�is de %d caracteres\n"
@@ -5683,85 +5742,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocada] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[caducada ]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "desco�ecido"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -6071,6 +6165,63 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "o algoritmo de resumo `%s' � de s� lectura nesta versi�n\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 ""
+#~ "Hase crear unh novo par de chaves %s.\n"
+#~ "             tama�o de chave m�nimo:  768 bits\n"
+#~ "        tama�o de chave por defecto: 1024 bits\n"
+#~ " tama�o de chave m�ximo recomendado: 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA s� admite tama�os entre 512 e 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "chave pequena de m�is; 1024 � o menor valor admitido para RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "chave pequena de m�is; 768 � o menor valor admitido\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "chave grande de m�is; %d � o maior tama�o admitido.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "�As chaves maiores de 2048 bits non se aconsellan porque\n"
+#~ "os c�lculos levan MOITO tempo!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "�Est� seguro de que quere este tama�o de chave? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "De acordo, �pero te�a en conta que a radiaci�n do monitor e o teclado "
+#~ "tam�n son vulnerables a ataques!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "�Os algoritmos experimentais non deber�an ser usados!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "este algoritmo de cifrado est� obsoleto; por favor, empregue un m�is "
+#~ "est�ndar!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "escribindo a `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
 
@@ -6198,12 +6349,6 @@ msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? problema ao comproba-la revocaci�n: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revocada] "
-
-#~ msgid "[expired] "
-#~ msgstr "[caducada ]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [caduca: %s]"
diff --git a/po/hu.po b/po/hu.po
index a883b40db..eb635247a 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -14,11 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "\"%s\" kivonatol� algoritmus csak olvashat� ebben a kiad�sban\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -33,11 +28,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -71,9 +67,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -127,90 +123,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "\"%s\" m�r t�m�r�tett.\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "�j kulcsp�r l�trehoz�sa"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -297,15 +353,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
@@ -313,141 +369,150 @@ msgstr "Mit v�laszt? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -455,232 +520,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, 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:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "kil�p�s|kilepes"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "�ltal�nos hiba"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Ism�telje meg a jelsz�t: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -690,13 +777,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -739,7 +826,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -758,7 +845,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -784,7 +871,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -887,27 +974,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
@@ -1086,15 +1173,15 @@ msgstr "ne csin�ljon semmi v�ltoztat�st"
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1102,7 +1189,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1122,15 +1209,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1140,7 +1227,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:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1148,462 +1235,462 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, 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:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, 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:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key felh-azonos�t�"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key felh-azonos�t�"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1611,23 +1698,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:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 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:3878
+#: g10/g10.c:3911
 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:3911
+#: g10/g10.c:3944
 #, 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"
@@ -1636,30 +1723,30 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, 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"
@@ -2018,381 +2105,381 @@ 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:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, 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:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, 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:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, 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:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
@@ -2627,7 +2714,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
 #: g10/keyedit.c:918
@@ -2700,7 +2788,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2731,7 +2819,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
@@ -3210,83 +3298,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[visszavont] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3294,7 +3366,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[visszavont] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3302,7 +3386,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3312,45 +3396,45 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3360,162 +3444,162 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 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:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 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:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 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:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nincs %d index� m�sodlagos kulcs!\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, 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:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3557,12 +3641,12 @@ msgstr "�nal��r�st �rok.\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@ -3630,90 +3714,60 @@ msgstr "   (%d) DSA (csak al��r�s)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Most egy �j %s kulcsp�rt hozunk l�tre.\n"
-"           minim�lis kulcsm�ret:  768 bit\n"
-"     alap�rtelmezett kulcsm�ret: 1024 bit\n"
-" legnagyobb aj�nlott kulcsm�ret: 2048 bit\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Milyen kulcsm�retet szeretne? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "A DSA csak 512 �s 1024 k�z�tti kulcsm�retet t�mogat.\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "Kulcsm�ret t�l kicsi; 1024 a legkisebb megengedett �rt�k RSA-hoz.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "Kulcsm�ret t�l kicsi; 768 a legkisebb megengedett �rt�k.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "Kulcsm�ret t�l nagy; %d a legnagyobb megengedett �rt�k.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"2048-n�l nagyobb kulcsm�ret nem aj�nlott, mert a sz�m�t�sok\n"
-"NAGYON sok�ig fognak tartani!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Biztos benne, hogy akarja ezt a kulcsm�retet? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Rendben, de vegye figyelembe, hogy a t�mad�k a monitor�nak vagy\n"
-"a billenty�zet�nek a sug�rz�s�t is felhaszn�lhatj�k!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "A k�v�nt kulcsm�ret %u bit.\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3729,7 +3783,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3745,29 +3799,29 @@ 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:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3775,12 +3829,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3797,44 +3851,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, 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:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3845,28 +3899,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3874,12 +3928,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3891,7 +3945,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3903,54 +3957,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 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:2938
+#: g10/keygen.c:2950
 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"
@@ -3959,60 +4009,60 @@ msgstr ""
 "k�v�n ilyen c�lra l�trehozni, azt az \"--edit-key\" parancs seg�ts�g�vel\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, 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:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4058,28 +4108,28 @@ msgstr "Kulcskarika"
 msgid "expired: %s)"
 msgstr " [lej�r: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4436,7 +4486,7 @@ msgstr "Bin�ris"
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
@@ -4467,29 +4517,42 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "Nem tudom letiltani a core f�jlokat: %s.\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Nem szabadna k�s�rleti algoritmusokat haszn�lni!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "nem megval�s�tott rejtjelez� algoritmus"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"Ez a rejtjelez� algoritmus nem aj�nlott. K�rem, haszn�ljon szabv�nyosabbat!\n"
+"%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
+"a c�mzett preferenci�ival.\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4599,52 +4662,52 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "Nem tudom be�ll�tani a kliens pid-et az �gyn�knek.\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "Nem tudom lek�rni a szerver olvas�si �llom�nyle�r�j�t az �gyn�knek.\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "Nem tudom lek�rni a szerver �r�si �llom�nyle�r�j�t az �gyn�knek.\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 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:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4656,41 +4719,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "�rv�nytelen v�lasz az �gyn�kt�l!\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, 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"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4701,17 +4764,17 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
@@ -4916,7 +4979,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "FIGYELEM: Ezt a kulcsot a tulajdonosa visszavonta!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Ez jelentheti azt, hogy az al��r�s hamis.\n"
 
 #: g10/pkclist.c:527
@@ -5022,28 +5086,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
@@ -5364,12 +5428,7 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "�rok a \"%s\" �llom�nyba.\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5377,41 +5436,41 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
 "nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5599,12 +5658,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "A bemeneti sor hosszabb, mint %d karakter.\n"
@@ -5655,85 +5714,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[visszavont] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[lej�rt]     "
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "Ismeretlen m�d�"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@ -6042,6 +6136,63 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "\"%s\" kivonatol� algoritmus csak olvashat� ebben a kiad�sban\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 ""
+#~ "Most egy �j %s kulcsp�rt hozunk l�tre.\n"
+#~ "           minim�lis kulcsm�ret:  768 bit\n"
+#~ "     alap�rtelmezett kulcsm�ret: 1024 bit\n"
+#~ " legnagyobb aj�nlott kulcsm�ret: 2048 bit\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "A DSA csak 512 �s 1024 k�z�tti kulcsm�retet t�mogat.\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "Kulcsm�ret t�l kicsi; 1024 a legkisebb megengedett �rt�k RSA-hoz.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "Kulcsm�ret t�l kicsi; 768 a legkisebb megengedett �rt�k.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "Kulcsm�ret t�l nagy; %d a legnagyobb megengedett �rt�k.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "2048-n�l nagyobb kulcsm�ret nem aj�nlott, mert a sz�m�t�sok\n"
+#~ "NAGYON sok�ig fognak tartani!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Biztos benne, hogy akarja ezt a kulcsm�retet? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Rendben, de vegye figyelembe, hogy a t�mad�k a monitor�nak vagy\n"
+#~ "a billenty�zet�nek a sug�rz�s�t is felhaszn�lhatj�k!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Nem szabadna k�s�rleti algoritmusokat haszn�lni!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "Ez a rejtjelez� algoritmus nem aj�nlott. K�rem, haszn�ljon "
+#~ "szabv�nyosabbat!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "�rok a \"%s\" �llom�nyba.\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
 
@@ -6173,12 +6324,6 @@ msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? Nem tudom ellen�rizni a visszavon�st: %s.\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[visszavont] "
-
-#~ msgid "[expired] "
-#~ msgstr "[lej�rt]     "
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [lej�r: %s]"
diff --git a/po/id.po b/po/id.po
index 809acd1ce..6adac9689 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -16,11 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -35,11 +30,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -72,9 +68,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "tidak dapat membuat %s: %s\n"
@@ -128,90 +124,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "gagal membaca keyblock: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: kesalahan membaca record bebas: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' sudah dikompresi\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "buat sepasang kunci baru"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "gagal menghapus keyblok: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -299,15 +355,15 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
@@ -315,141 +371,150 @@ msgstr "Pilihan anda? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -457,232 +522,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "q|k|keluar"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "bantuan"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "tampilkan"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "Kesalahan umum"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Ulangi passphrase: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -692,13 +779,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -741,7 +828,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -760,7 +847,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -788,7 +875,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -890,28 +977,28 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1090,15 +1177,15 @@ msgstr "jangan buat perubahan"
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1106,7 +1193,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1126,15 +1213,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1144,7 +1231,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1152,470 +1239,470 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1623,23 +1710,23 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1648,27 +1735,27 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -2033,378 +2120,378 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@ -2643,7 +2730,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
 #: g10/keyedit.c:918
@@ -2716,7 +2804,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2747,7 +2835,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
@@ -3226,83 +3314,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revoked] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3310,7 +3382,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revoked] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3318,7 +3402,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3328,45 +3412,45 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3376,165 +3460,165 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3576,12 +3660,12 @@ msgstr "menulis self signature\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
@@ -3649,91 +3733,60 @@ msgstr "  (%d) DSA (hanya menandai)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "  (%d) RSA (hanya enkripsi)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Akan dibuat satu pasang kunci baru %s.\n"
-"       keysize minimum adalah  768 bit\n"
-"       keysize default adalah 1024 bit\n"
-" keysize tertinggi dianjurkan 2048 bit\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Keysize yang anda inginkan? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
-"komputasi akan sangat lama!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Apakah anda yakin memerlukan keysize ini? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat mudah "
-"diserang!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Keysize yang diminta adalah %u bit\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3749,7 +3802,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3765,29 +3818,29 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3795,12 +3848,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3816,44 +3869,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3863,27 +3916,27 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3891,12 +3944,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3909,7 +3962,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3921,54 +3974,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3977,59 +4026,59 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4075,28 +4124,28 @@ msgstr "Keyring"
 msgid "expired: %s)"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4448,7 +4497,7 @@ msgstr "biner"
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "tidak dikenal"
 
@@ -4480,29 +4529,40 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "tidak dapat meniadakan core dump: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritma cipher belum diimplementasikan"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4611,50 +4671,50 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "tidak dapat menset pid client untuk agen\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "tidak dapat membuat server membaca FD untuk agen\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "tidak dapat membuat server menulis FD untuk agen\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4665,41 +4725,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "passphrase terlalu panjang\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "respon tidak valid dari agen\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4709,17 +4769,17 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -4927,7 +4987,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pemiliknya!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "        Hal ini dapat berarti bahwa signature adalah palsu.\n"
 
 #: g10/pkclist.c:527
@@ -5030,28 +5091,28 @@ msgstr "tidak ada alamat yang valid\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
@@ -5374,53 +5435,48 @@ msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "menulis ke `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5608,12 +5664,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "baris input lebih dari %d karakter\n"
@@ -5663,85 +5719,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revoked] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[expired] "
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "tidak dikenal"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6051,6 +6142,64 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "algoritma digest `%s' adalah hanya-baca dalam rilis ini\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 ""
+#~ "Akan dibuat satu pasang kunci baru %s.\n"
+#~ "       keysize minimum adalah  768 bit\n"
+#~ "       keysize default adalah 1024 bit\n"
+#~ " keysize tertinggi dianjurkan 2048 bit\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA hanya membolehkan keysize dari 512 hingga 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "keysize terlalu kecil; 1024 adalah nilai terendah yang diijinkan untuk "
+#~ "RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "keysize terlalu kecil; 768 adalah nilai terendah yang diijinkan.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "keysize terlalu besar; %d adalah nilai tertinggi yang diijinkan.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Keysize lebih besar dari 2048 tidak dianjurkan karena\n"
+#~ "komputasi akan sangat lama!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Apakah anda yakin memerlukan keysize ini? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Oke, tetapi ingat bahwa radiasi monitor dan keyboard anda juga sangat "
+#~ "mudah diserang!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Algoritma eksperimental sebaiknya tidak dipakai!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "algoritma cipher ini didepresiasi; silakan gunakan yang lebih standar!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "menulis ke `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
 
@@ -6178,12 +6327,6 @@ msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revoked] "
-
-#~ msgid "[expired] "
-#~ msgstr "[expired] "
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [berakhir: %s]"
diff --git a/po/it.po b/po/it.po
index cae774fd5..7d5a4930a 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -14,11 +14,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "in questa versione l'algoritmo digest `%s' � in sola lettura\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -33,11 +28,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -71,9 +67,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "impossibile creare `%s': %s\n"
@@ -129,90 +125,150 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "errore leggendo il keyblock: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: errore durante la lettura del record libero: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' � gi� compresso\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genera una nuova coppia di chiavi"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "cancellazione del keyblock fallita: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -300,15 +356,15 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
@@ -316,142 +372,151 @@ msgstr "Cosa scegli? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -459,232 +524,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "abilita"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "errore generale"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Ripeti la passphrase: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -694,13 +781,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -743,7 +830,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -763,7 +850,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -794,7 +881,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -902,27 +989,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
@@ -1101,15 +1188,15 @@ msgstr "non fa cambiamenti"
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1117,7 +1204,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1137,15 +1224,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1155,7 +1242,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1163,467 +1250,467 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1631,23 +1718,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:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1656,28 +1743,28 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -2043,381 +2130,381 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, 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:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
@@ -2654,7 +2741,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
 #: g10/keyedit.c:918
@@ -2727,7 +2815,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2758,7 +2846,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
@@ -3237,83 +3325,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revocata]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3322,7 +3394,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revocata]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3331,7 +3415,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3340,46 +3424,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3389,168 +3473,168 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3593,12 +3677,12 @@ msgstr "scrittura della autofirma\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -3666,90 +3750,60 @@ msgstr "   (%d) DSA (firma solo)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (cifra solo)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (cifra solo)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Sto per generare una nuova coppia di chiavi %s.\n"
-"               la dimensione minima �  768 bit\n"
-"          la dimensione predefinita � 1024 bit\n"
-"  la dimensione massima consigliata � 2048 bit\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Di che dimensioni vuoi la chiave? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "La coppia DSA avr� 1024 bit.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
-"VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Di che dimensioni vuoi la chiave? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
-"tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La dimensione richiesta della chiave � %u bit\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3765,7 +3819,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3781,29 +3835,29 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3811,12 +3865,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3833,44 +3887,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3881,27 +3935,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3909,12 +3963,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3926,7 +3980,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3938,54 +3992,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "La coppia DSA avr� 1024 bit.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3994,12 +4044,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4007,7 +4057,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4015,40 +4065,40 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4094,28 +4144,28 @@ msgstr "Portachiavi"
 msgid "expired: %s)"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4470,7 +4520,7 @@ msgstr "binario"
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -4501,28 +4551,41 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "impossibile disabilitare i core dump: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritmo di cifratura non implementato"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4635,50 +4698,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "impossibile impostare il pid del client dell'agent\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "impossibile ottenere il FD di lettura dell'agent\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "impossibile ottenere il FD di scrittura dell'agent\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4689,41 +4752,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "passphrase troppo lunga\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "risposta non valida dall'agent\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4733,17 +4796,17 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -4954,7 +5017,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
 #: g10/pkclist.c:527
@@ -5058,28 +5122,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -5419,53 +5483,48 @@ msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "scrittura in `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5653,12 +5712,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linea di input pi� lunga di %d caratteri\n"
@@ -5709,85 +5768,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocata]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[scaduta]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "sconosciuto"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -6097,6 +6191,63 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "in questa versione l'algoritmo digest `%s' � in sola lettura\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 ""
+#~ "Sto per generare una nuova coppia di chiavi %s.\n"
+#~ "               la dimensione minima �  768 bit\n"
+#~ "          la dimensione predefinita � 1024 bit\n"
+#~ "  la dimensione massima consigliata � 2048 bit\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permette solo chiavi di dimensioni tra 512 e 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "la chiave � troppo corta; 1024 � il minimo valore permesso per RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "la chiave � troppo lunga; %d � il massimo valore permesso.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono\n"
+#~ "VERAMENTE lunghi!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e "
+#~ "dalla tua tastiera sono molto vulnerabili ad attacchi!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Gli algoritmi sperimentali non dovrebbero essere usati!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "questo algoritmo di cifratura � deprecato; usane uno pi� standard!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "scrittura in `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
 
@@ -6225,12 +6376,6 @@ msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? problema controllando la revoca: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revocata]"
-
-#~ msgid "[expired] "
-#~ msgstr "[scaduta]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "[scadenza: %s]"
diff --git a/po/ja.po b/po/ja.po
index 1b0c31c7d..2767abd3c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,31 +1,26 @@
 # Japanese messages for GnuPG
-# Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
-# IIDA Yosiaki <[email protected]>, 1999, 2000, 2002, 2003.
+# Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# IIDA Yosiaki <[email protected]>, 1999, 2000, 2002, 2003, 2004.
 # Yoshihiro Kajiki <[email protected]>, 1999.
 # This file is distributed under the same license as the GnuPG package.
 # Special thanks to "Takashi P.KATOH".
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.1\n"
+"Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
-"PO-Revision-Date: 2003-12-06 00:44+0900\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "���󥢥르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
-
 #: cipher/primegen.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
+msgstr "pbits=%u qbits=%u���ǿ��������Ǥ��ޤ���\n"
 
 #: cipher/primegen.c:311
 #, c-format
@@ -36,11 +31,12 @@ msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -62,7 +58,7 @@ msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
 #: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "�ٹ�: ̵���ʥ������� random_seed �ե����� - �Ȥ��ޤ���\n"
+msgstr "�ٹ�: ̵����Ĺ���� random_seed �ե����� - �Ȥ��ޤ���\n"
 
 #: cipher/random.c:415
 #, c-format
@@ -73,17 +69,17 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "��%s�פ��Ǥ��ޤ���: %s\n"
+msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "��%s�פ˽񤱤ޤ���: %s\n"
+msgstr "��%s�פ˽񤭹���ޤ���: %s\n"
 
 #: cipher/random.c:483
 #, c-format
@@ -105,7 +101,7 @@ msgstr ""
 "��ܤ���Ƥ�����������Ҥϡ��Ź��ѤȤ��ƤϤ����ޤĤǡ�\n"
 "����������Ǥ��ޤ���!\n"
 "\n"
-"���Υץ����������������ǡ�������ڻ��Ѥ��ƤϤ����ޤ���!!\n"
+"���Υץ����������������ǡ�������ڻȤäƤϤ����ޤ���!!\n"
 "\n"
 
 #: cipher/rndegd.c:204
@@ -128,89 +124,145 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/app-openpgp.c:534
-#, fuzzy, c-format
+#: g10/app-openpgp.c:539
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
+msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:552
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
+msgstr "���������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, 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:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
-#, fuzzy, c-format
+#: 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
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
+msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
+msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
-msgstr ""
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr "|A|Admin PIN"
+
+#: g10/app-openpgp.c:1021
+#, fuzzy
+msgid "|AN|New Admin PIN"
+msgstr "|A|������Admin PIN"
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "������PIN"
+
+#: g10/app-openpgp.c:1025
 #, c-format
-msgid "PIN [sigs done: %lu]"
-msgstr ""
+msgid "error getting new PIN: %s\n"
+msgstr "������PIN�μ������顼: %s\n"
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+msgid "error reading application data\n"
+msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1668
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "�ѥ��ե졼���κ������顼: %s\n"
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+msgid "error reading fingerprint DO\n"
+msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: g10/app-openpgp.c:1763
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
+#: g10/app-openpgp.c:1107
+msgid "key already exists\n"
+msgstr "���Ϥ⤦����ޤ�\n"
 
-#: g10/app-openpgp.c:1805
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
+
+#: g10/app-openpgp.c:1113
+msgid "generating new key\n"
+msgstr "��������������\n"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr "�������δ֡����Ԥ��������� ...\n"
+
+#: g10/app-openpgp.c:1138
+msgid "generating key failed\n"
+msgstr "���������˼��Ԥ��ޤ���\n"
+
+#: g10/app-openpgp.c:1141
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: g10/app-openpgp.c:1812
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
 msgid "response does not contain the public key data\n"
-msgstr ""
+msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1820
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
 msgid "response does not contain the RSA modulus\n"
-msgstr ""
+msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1831
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
 msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "����ޤǤ˺������줿��̾: %lu\n"
+
+#: g10/app-openpgp.c:1367
+#, c-format
+msgid "PIN [sigs done: %lu]"
+msgstr "PIN [��̾��: %lu]"
+
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
+
+#: g10/app-openpgp.c:1734
+#, c-format
+msgid "error getting serial number: %s\n"
+msgstr "���֤μ������顼: %s\n"
+
+#: g10/app-openpgp.c:1829
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
+
+#: g10/app-openpgp.c:1871
+msgid "reading the key failed\n"
+msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
 #: g10/armor.c:317
 #, c-format
@@ -234,18 +286,17 @@ msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
 #: g10/armor.c:551
-#, fuzzy
 msgid "unexpected armor: "
-msgstr "ͽ����������:"
+msgstr "ͽ����������: "
 
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
 #: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "̵����64��ʸ��%02x��ȤФ��ޤ�\n"
+msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
@@ -260,12 +311,11 @@ msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
 #: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC���顼��%06lx - %06lx\n"
+msgstr "CRC���顼��%06lX - %06lX\n"
 
 #: g10/armor.c:824
-#, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
@@ -286,403 +336,405 @@ msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
-"��������� quoted printable ʸ��������ޤ��������餯�Х��Τ���\n"
-"MTA����Ѥ����ΤǤ��礦\n"
+"���������quoted printableʸ��������ޤ��������餯�Х��Τ���\n"
+"MTA��Ȥä��ΤǤ��礦\n"
 
 #: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "��̩���������ޤ���"
+msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 
 #: g10/card-util.c:63
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
-msgstr ""
+msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
-msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
+msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
-#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
-msgstr "�ɤ�ˤ��ޤ���? "
+msgstr "�����? "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[̤����]"
 
-#: g10/card-util.c:376
-#, fuzzy
+#: g10/card-util.c:378
 msgid "male"
-msgstr "enable"
+msgstr "��"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "female"
-msgstr "enable"
+msgstr "��"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "unspecified"
-msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
+msgstr "̵����"
 
-#: g10/card-util.c:396
-#, fuzzy
+#: g10/card-util.c:406
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
-msgstr ""
+msgstr "����"
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:502
-#, fuzzy
+#: g10/card-util.c:521
 msgid "URL to retrieve public key: "
-msgstr "�б����������������ޤ���: %s\n"
+msgstr "��������õ������URL: "
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "`%s'���ɹ��ߥ��顼: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
-msgstr ""
+msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
+
+#: g10/card-util.c:699
+msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:641
-#, fuzzy
+#: g10/card-util.c:709
+#, fuzzy, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
+
+#: g10/card-util.c:729
 msgid "Language preferences: "
-msgstr "�����ΰ����򹹿�"
+msgstr "���������: "
 
-#: g10/card-util.c:649
-#, fuzzy
+#: g10/card-util.c:737
 msgid "Error: invalid length of preference string.\n"
-msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:658
-#, fuzzy
+#: g10/card-util.c:746
 msgid "Error: invalid characters in preference string.\n"
-msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:693
-#, fuzzy
+#: g10/card-util.c:781
 msgid "Error: invalid response.\n"
-msgstr "���顼: ̵���ʻ���\n"
+msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:714
-#, fuzzy
+#: g10/card-util.c:802
 msgid "CA fingerprint: "
-msgstr "�����ɽ��"
+msgstr "CA���: "
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:825
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "���顼: ̵���ʻ���\n"
+msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:785
-#, fuzzy, c-format
+#: g10/card-util.c:873
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "���������˼��Ԥ��ޤ���: %s\n"
+msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:786
-#, fuzzy
+#: g10/card-util.c:874
 msgid "not an OpenPGP card"
-msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
+msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:795
-#, fuzzy, c-format
+#: g10/card-util.c:883
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
+msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, 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:968
-#, fuzzy
+#: g10/card-util.c:1056
 msgid "Please select the type of key to generate:\n"
-msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
+msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
-#, fuzzy
+#: g10/card-util.c:1058 g10/card-util.c:1138
 msgid "   (1) Signature key\n"
-msgstr "�����ڤ�ν�̾ %s\n"
+msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
-#, fuzzy
+#: g10/card-util.c:1059 g10/card-util.c:1140
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
+msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1047
-#, fuzzy
+#: g10/card-util.c:1135
 msgid "Please select where to store the key:\n"
-msgstr "��������ͳ�����򤷤Ƥ�������:\n"
+msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1082
-#, fuzzy
+#: g10/card-util.c:1170
 msgid "unknown key protection algorithm\n"
-msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
+msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1087
-#, fuzzy
+#: g10/card-util.c:1175
 msgid "secret parts of key are not available\n"
-msgstr "�縰����̩��ʬ�������ޤ���\n"
+msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1092
-#, fuzzy
+#: g10/card-util.c:1180
 msgid "secret key already stored on a card\n"
-msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
+msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
-#: g10/card-util.c:1164
-#, fuzzy
+#: g10/card-util.c:1252
 msgid "show admin commands"
-msgstr "��Ω���륳�ޥ��\n"
+msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
-#, fuzzy
+#: g10/card-util.c:1255
 msgid "list all available data"
-msgstr "�ʲ��˸�������ޤ�: "
+msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
-#, fuzzy
+#: g10/card-util.c:1258
 msgid "name"
-msgstr "enable"
+msgstr "name"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
-msgstr ""
+msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
-msgstr ""
+msgstr "url"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
-msgstr ""
+msgstr "fetch"
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "login"
-msgstr "lsign"
+msgstr "login"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "change the login name"
-msgstr "ͭ�����¤��ѹ�"
+msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
-msgstr ""
+msgstr "lang"
 
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1263
 msgid "change the language preferences"
-msgstr "��ͭ�Կ��Ѥ��ѹ�"
+msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
-msgstr ""
+msgstr "sex"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
-msgstr ""
+msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "cafpr"
-msgstr "fpr"
+msgstr "cafpr"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "change a CA fingerprint"
-msgstr "�����ɽ��"
+msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1178
-#, fuzzy
+#: g10/card-util.c:1266
 msgid "forcesig"
-msgstr "revsig"
+msgstr "forcesig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1180
-#, fuzzy
+#: g10/card-util.c:1268
 msgid "generate"
-msgstr "����Ū�ʥ��顼"
+msgstr "generate"
 
-#: g10/card-util.c:1181
-#, fuzzy
+#: g10/card-util.c:1269
 msgid "generate new keys"
-msgstr "��������������"
+msgstr "����������������"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
+msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
+
+#: g10/card-util.c:1272
+msgid "privatedo"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1281
-#, fuzzy
+#: g10/card-util.c:1371
 msgid "Admin-only command\n"
-msgstr "��Ω���륳�ޥ��\n"
+msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1297
-#, fuzzy
+#: g10/card-util.c:1387
 msgid "Admin commands are allowed\n"
-msgstr "��Ω���륳�ޥ��\n"
+msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1389
 msgid "Admin commands are not allowed\n"
-msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
-msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
+msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, 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:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
+
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Admin PIN������: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "PIN������: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
-msgstr ""
+msgstr "PIN������: "
+
+#: g10/cardglue.c:704
+msgid "Repeat this PIN: "
+msgstr "PIN�������: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:718
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -692,36 +744,33 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
+msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
+msgstr "���֥��å����ɽФ����顼: %s\n"
 
 #: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(���뤤�ϡ�����Ǹ������)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
+msgstr "��--yes�ɤΤʤ��Хå����⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "���θ����ؤ��������ޤ���? "
+msgstr "���θ����ؤ��������ޤ���? (y/N) "
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "�������̩���Ǥ�! �����˺�����ޤ���? "
+msgstr "�������̩���Ǥ�! �����˺�����ޤ���? (y/N) "
 
 #: g10/delkey.c:157
 #, c-format
@@ -735,13 +784,13 @@ msgstr "��ͭ�Կ��Ѿ���򥯥ꥢ���ޤ���\n"
 #: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "���θ������ˤ���������̩����%s�פ�����ޤ�!\n"
+msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 
 #: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n"
+msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -751,19 +800,19 @@ msgid "can't use a symmetric ESK packet due to the S2K mode\n"
 msgstr "S2K�⡼�ɤΤ��ᡢ�о�ESK�ѥ��åȤ�Ȥ��ޤ���\n"
 
 #: g10/encode.c:228
-#, fuzzy, c-format
+#, c-format
 msgid "using cipher %s\n"
-msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
+msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 
 #: g10/encode.c:238 g10/encode.c:558
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "`%s'�ϴ��˰��̺ѤߤǤ�\n"
+msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "�ٹ�: `%s'�϶��Υե�����Ǥ�\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"
@@ -772,7 +821,7 @@ msgstr "--pgp2�⡼�ɤǤ�2048�ӥåȰʲ���RSA���ǰŹ沽�����Ǥ��ޤ���\n"
 #: g10/encode.c:494
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "`%s'�����ɤ߹��ߤޤ�\n"
+msgstr "��%s�פ����ɤ߽Ф��ޤ�\n"
 
 #: g10/encode.c:530
 msgid ""
@@ -780,32 +829,32 @@ msgid ""
 msgstr "�Ź沽���褦�Ȥ��Ƥ��븰������IDEA�Ź��Ȥ��ޤ���\n"
 
 #: g10/encode.c:540
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:648 g10/sign.c:876
-#, fuzzy, c-format
+#: g10/encode.c:648 g10/sign.c:877
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
-msgstr "���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
 #: g10/encode.c:735
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\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 "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
 #: g10/encode.c:832
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s�Ź沽 ������: \"%s\"\n"
+msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
 #: g10/encr-data.c:66 g10/mainproc.c:301
 #, c-format
@@ -815,7 +864,7 @@ msgstr "%s�Ź沽�Ѥߥǡ���\n"
 #: g10/encr-data.c:68 g10/mainproc.c:305
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
+msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
 
 #: g10/encr-data.c:92
 msgid ""
@@ -824,7 +873,7 @@ msgstr "�ٹ�: ��å��������оΰŹ�ˡ�μ夤���ǰŹ沽����Ƥ��ޤ���\n"
 
 #: g10/encr-data.c:103
 msgid "problem handling encrypted packet\n"
-msgstr "�Ź�ѥ��åȤμ�갷���Ǿ㳲\n"
+msgstr "�Ź沽�ѥ��åȤμ谷���Ǿ㳲\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
@@ -833,7 +882,7 @@ msgstr "��֥ץ������μ¹Ԥϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 #: g10/exec.c:184 g10/openfile.c:406
 #, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���: %s\n"
+msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
 #: g10/exec.c:325
 msgid ""
@@ -843,20 +892,19 @@ msgstr ""
 "�����ץ������θƽФ��ϡ����ѶػߤǤ���\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "���Υץ�åȥۡ�����ȡ������ץ������θƽФ��ˤϡ�����ե����뤬ɬ�פǤ�\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "�¹ԤǤ��ޤ��� %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 "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
+msgstr "�������%s�פ�¹ԤǤ��ޤ���: %s\n"
 
 #: g10/exec.c:521
 #, c-format
@@ -874,39 +922,38 @@ msgstr "�����ץ�������¹ԤǤ��ޤ���\n"
 #: g10/exec.c:563
 #, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "�����ץ������α������ɤ߹���ޤ���: %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 "�ٹ�: ����ե���������Ǥ��ޤ��� (%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 "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:176
-#, fuzzy
+#: g10/export.c:182
 msgid "exporting secret keys not allowed\n"
-msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:206
-#, fuzzy, c-format
+#: g10/export.c:211
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "�� %08lX: �ݸ��Ƥ��ޤ��� - �����å�\n"
+msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:214
-#, fuzzy, c-format
+#: g10/export.c:219
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "�� %08lX: PGP 2.x�����θ��Ǥ� - �����å�\n"
+msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:361
-#, fuzzy, c-format
+#: g10/export.c:384
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "�ٹ�: ��̩��%08lX�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
+msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
@@ -955,9 +1002,8 @@ msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
 #: g10/g10.c:374
-#, fuzzy
 msgid "list and check key signatures"
-msgstr "���ν�̾�򸡺�"
+msgstr "����̾�θ����Ȱ���"
 
 #: g10/g10.c:375
 msgid "list keys and fingerprints"
@@ -1021,15 +1067,15 @@ msgstr "�����ɹ���/ʻ��"
 
 #: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "�����ɾ��֤�ɽ��"
 
 #: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "�����ɤΥǡ������ѹ�"
 
 #: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "�����ɤ�PIN���ѹ�"
 
 #: g10/g10.c:410
 msgid "update the trust database"
@@ -1037,7 +1083,7 @@ msgstr "���ѥǡ����١����򹹿�"
 
 #: g10/g10.c:417
 msgid "|algo [files]|print message digests"
-msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
+msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
 #: g10/g10.c:421 g10/gpgv.c:65
 msgid ""
@@ -1089,15 +1135,15 @@ msgstr "̵�ѹ�"
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1106,7 +1152,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1126,15 +1172,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1142,9 +1188,9 @@ msgid ""
 msgstr ""
 "��: gpg [���ץ����] [�ե�����]\n"
 "��̾���������Ź沽������\n"
-"�����ư��ϡ����ϥǡ����˰�¸\n"
+"��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1152,516 +1198,504 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
-msgstr "�Ź�: "
+msgstr "�Ź�ˡ: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:982
-#, fuzzy, c-format
+#: g10/g10.c:1017
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:1179
-#, fuzzy, c-format
+#: g10/g10.c:1214
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
+msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1182
-#, fuzzy, c-format
+#: g10/g10.c:1217
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
+msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1185
-#, fuzzy, c-format
+#: g10/g10.c:1220
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���ͭ��\n"
+msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1191
-#, fuzzy, c-format
+#: g10/g10.c:1226
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1194
-#, fuzzy, c-format
+#: g10/g10.c:1229
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1197
-#, fuzzy, c-format
+#: g10/g10.c:1232
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ�����\n"
+msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1203
-#, fuzzy, c-format
+#: g10/g10.c:1238
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1206
-#, fuzzy, c-format
+#: g10/g10.c:1241
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1209
-#, fuzzy, c-format
+#: g10/g10.c:1244
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
+msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1215
-#, fuzzy, c-format
+#: g10/g10.c:1250
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/g10.c:1253
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/g10.c:1256
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "�ٹ�: %s ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
+msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1362
-#, fuzzy, c-format
+#: g10/g10.c:1397
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
+msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
+msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
-msgstr "����: ����%s���Ѥ��ޤ���!\n"
+msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/g10.c:2048
-#, fuzzy, c-format
+#: g10/g10.c:2079
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
+msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:2260
-#, fuzzy, c-format
+#: g10/g10.c:2293
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
+msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
-#, fuzzy
+#: g10/g10.c:2312 g10/keyedit.c:3434
 msgid "could not parse keyserver URL\n"
-msgstr "�������С���URI�������ǽ\n"
+msgstr "�������С���URL�������ǽ\n"
 
-#: g10/g10.c:2285
-#, fuzzy, c-format
+#: g10/g10.c:2318
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
+msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2288
-#, fuzzy
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
-msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
+msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
+msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2315
-#, fuzzy, c-format
+#: g10/g10.c:2348
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����\n"
+msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2318
-#, fuzzy
+#: g10/g10.c:2351
 msgid "invalid list options\n"
-msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
+msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2340
-#, fuzzy, c-format
+#: g10/g10.c:2373
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s:%d: ̵���ʽ�Ф����ץ����\n"
+msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2343
-#, fuzzy
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
-msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
+msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
+msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ��Ʊ���ˤǤ��ޤ���\n"
+msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź椬ɬ�פǤ� \n"
+msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
-msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
+msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2684
-#, fuzzy
+#: g10/g10.c:2717
 msgid "selected compression algorithm is invalid\n"
-msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
+msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2709
-#, fuzzy
+#: g10/g10.c:2742
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2711
-#, fuzzy
+#: g10/g10.c:2744
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
+msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2713
-#, fuzzy
+#: g10/g10.c:2746
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "̵����default-check-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
+msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
-msgstr "̵���ʸĿ��ѰŹ������\n"
+msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/g10.c:2824
-#, fuzzy, c-format
+#: g10/g10.c:2857
+#, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2829
-#, fuzzy, c-format
+#: g10/g10.c:2862
+#, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2834
-#, fuzzy, c-format
+#: g10/g10.c:2867
+#, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:2961
-#, fuzzy, c-format
+#: g10/g10.c:2994
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "����˼��Ԥ��ޤ���: %s\n"
+msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:2984
-#, fuzzy
+#: g10/g10.c:3017
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [�ե�����̾]"
+msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2989
-#, fuzzy, c-format
+#: g10/g10.c:3022
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3035
-#, fuzzy
+#: g10/g10.c:3068
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [�ե�����̾]"
+msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3040
-#, fuzzy, c-format
+#: g10/g10.c:3073
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "%s��%s�⡼�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �桼����id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �桼����id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
+msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
-msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
+msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
-"����̾�ˤϰ�����ǽ��ʸ��������Τߤ��Ѥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
+"����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
-msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
+msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3911
-#, fuzzy
+#: g10/g10.c:3944
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
+msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2711
 msgid "[User ID not found]"
-msgstr "[�桼����id�����Ĥ���ޤ���]"
+msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1614
-#, fuzzy, c-format
+#: g10/getkey.c:1639
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%08lX�Ǥ�\n"
+msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2169
-#, fuzzy, c-format
+#: g10/getkey.c:2189
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "��������%08lX�ˤ���������̩����������ޤ��� - ̵��\n"
+msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2400
-#, fuzzy, c-format
+#: g10/getkey.c:2420
+#, c-format
 msgid "using secondary key %s instead of primary key %s\n"
-msgstr "����%08lX��縰%08lX�����Ѥ��ޤ�\n"
+msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2447
-#, fuzzy, c-format
+#: g10/getkey.c:2467
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "��%08lX: �������Τʤ���̩���Ǥ� - �����å�\n"
+msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
 #: g10/gpgv.c:68
 msgid "be somewhat more quiet"
@@ -1679,7 +1713,7 @@ msgstr "������̷���ٹ�����ˤ��ޤ�"
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
-"�񤭽Ф�"
+"�񤭹���"
 
 #: g10/gpgv.c:96
 msgid "Usage: gpgv [options] [files] (-h for help)"
@@ -1691,7 +1725,7 @@ msgid ""
 "Check signatures against known trusted keys\n"
 msgstr ""
 "��ʸ: gpg [���ץ����] [�ե�����]\n"
-"���Ѥ������ǽ�̾�򸡺�\n"
+"���Το��Ѥ������ǽ�̾�򸡺�\n"
 
 #: g10/helptext.c:48
 msgid ""
@@ -1699,7 +1733,7 @@ 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 ""
-"�����ͤ�����ϡ����ʤ�����Ǥ��������ͤϡ��軰�Ԥ˷褷\n"
+"�����ͤλ���ϡ����ʤ�����Ǥ��������ͤϡ��軰�Ԥ˷褷\n"
 "���󶡤���ޤ��󡣤���ϡ�web-of-trust �μ�����ɬ�פǡ�\n"
 "(����Ū�ˤǤ���) web-of-certificates �Ȥ�̵�ط��Ǥ���"
 
@@ -1713,16 +1747,16 @@ msgstr ""
 "Web-of-Trust���ۤ��뤿��GnuPG�ϡ��ɤθ�������Ū�˿��Ѥ���\n"
 "�Τ����Τ�ɬ�פ�����ޤ�������ϤդĤ�����̩���˥��������Ǥ�\n"
 "�븰�Τ��ȤǤ������θ�������Ū�˿��Ѥ��뤳�Ȥˤ���ʤ顢\n"
-"��yes�פ������Ƥ���������\n"
+"��yes�ɤ������Ƥ���������\n"
 
 #: g10/helptext.c:61
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�פ������Ƥ���������"
+msgstr "���ο��ѤǤ��ʤ�����Ȥ������ʤ���С���no�ɤ������Ƥ���������"
 
 #: g10/helptext.c:65
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "��å�������������ꥢ�ɥ쥹�Υ桼����ID�����Ϥ��Ƥ���������"
+msgstr "���ʤ��������å���������Υ桼����ID�����Ϥ��Ƥ���������"
 
 #: g10/helptext.c:69
 msgid ""
@@ -1737,6 +1771,15 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"���Ѥ��륢�르�ꥺ������򤷤Ƥ���������\n"
+"\n"
+"DSA (��̾DSS) �ϡ���̾���Ѥ��Żҽ�̾���르�ꥺ��Ǥ���\n"
+"\n"
+"Elgamal�ϡ��Ź沽�ΤߤΥ��르�ꥺ��Ǥ���\n"
+"\n"
+"RSA�ϡ���̾�ˤ�Ź沽�ˤ�Ȥ��ޤ���\n"
+"\n"
+"�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ���"
 
 #: g10/helptext.c:83
 msgid ""
@@ -1744,7 +1787,7 @@ msgid ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
-"���̤ˡ���̾�ȰŹ��Ʊ������Ȥ��Τϡ������������ޤ���\n"
+"���̤ˡ���̾�ȰŹ沽��Ʊ������Ȥ��Τϡ������������ޤ���\n"
 "���Υ��르�ꥺ��ϡ�������ϰ�������ǻȤ���٤��Ǥ���\n"
 "�ޤ����������ƥ���������Ȥˤ����̤���������"
 
@@ -1755,7 +1798,7 @@ 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 ""
@@ -1766,12 +1809,12 @@ msgid ""
 msgstr ""
 "�ץ���ץȤ˼����񼰤��ͤ����Ϥ��Ƥ���������\n"
 "ISO�����դν� (YYYY-MM-DD) �Ǥ����ϤǤ��ޤ��������������顼��\n"
-"ɽ������ʤ��Ǥ��礦��������ꡢ�����ƥ�������ͤ���֤��Ѵ�����\n"
-"�褦�˻�ߤޤ���"
+"ɽ������ʤ��Ǥ��礦���������ꡢ�����ƥ�������ͤ���֤��Ѵ�\n"
+"����褦�˻�ߤޤ���"
 
 #: g10/helptext.c:116
 msgid "Enter the name of the key holder"
-msgstr "���ۥ����̾�������Ϥ��Ƥ�������"
+msgstr "����ͭ�Ԥ�̾�������Ϥ��Ƥ�������"
 
 #: g10/helptext.c:121
 msgid "please enter an optional but highly suggested email address"
@@ -1791,13 +1834,13 @@ msgid ""
 msgstr ""
 "N  ̾�����ѹ���\n"
 "C  �����Ȥ��ѹ���\n"
-"E  �Żҥ᡼��Υ��ɥ쥹���ѹ���\n"
-"O  ����������³�ԡ�\n"
-"Q  ������������ߡ�"
+"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 "���������������硢��yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
+msgstr "�������������Ƥ褱��С���yes��(�ޤ��ϡ�ñ�ˡ�y��) �������Ƥ���������"
 
 #: g10/helptext.c:147
 msgid ""
@@ -1840,14 +1883,14 @@ msgid ""
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
 "���Υ桼����ID�˽�̾����Ȥ��ϡ����Υ桼����ID��̾���οͤ���\n"
-"���ͭ���Ƥ��롢�Ȥ������Ȥ��ǧ����٤��Ǥ������ʤ����ɤ���\n"
+"���ͭ���Ƥ��롢�Ȥ������Ȥ򸡾ڤ���٤��Ǥ������ʤ����ɤ���\n"
 "�����տ�����ǧ�����Τ���¾�οͤ������Τ餻��ȡ������Ǥ���\n"
 "\n"
 "\"0\" �ϡ����ʤ����ɤ��������տ�����ǧ�����Τ����ä˼�ĥ����\n"
 "    ���Ȥ�����̣�Ǥ���\n"
 "\n"
 "\"1\" �ϡ����ν�ͭ�Ԥȼ�ĥ���Ƥ���ͤ����θ����ͭ���Ƥ��롢��\n"
-"    ���ʤ��Ͽ����ƤϤ����ΤΡ���ǧ���������Ƥʤ��ä����ޤ�\n"
+"    ���ʤ��Ͽ����ƤϤ����ΤΡ����ڤ��������Ƥʤ��ä����ޤ�\n"
 "    �ϤǤ��ʤ��ä����Ȥ�����̣�Ǥ�������ϡ��ڥ�͡����Ȥ�\n"
 "    �桼�����θ��˽�̾������Ρ��֥ڥ륽�ʡ׳�ǧ�������Ǥ���\n"
 "\n"
@@ -1862,28 +1905,27 @@ msgstr ""
 "    �ơ�(�Żҥ᡼��θ򴹤ʤɤ�) �����Żҥ᡼�롦���ɥ쥹��\n"
 "    ���ν�ͭ�Ԥ�°���Ƥ��뤳�Ȥ򸡾ڤ�����礬�����Ǥ���\n"
 "\n"
-"�嵭2��3����ϡ�*ñ�ʤ�*��ˤ����ʤ����Ȥ������Ȥ�ǰƬ���֤�\n"
-"�Ƥ���������¾�θ��˽�̾����ݡ��ְ���פ�ֹ��ϰϡפ������\n"
+"�嵭2��3����ϡ�*ñ�ʤ�*��ˤ����ʤ����Ȥ������Ȥ�ǰƬ�ˤ���\n"
+"�Ƥ���������¾�θ��˽�̾����ݡ��ذ���٤�ع��ϰϡ٤������\n"
 "̣���뤫��ǽ�Ū�˷���Τϡ����ʤ��Ǥ���\n"
 "\n"
 "���������Τ狼��ʤ����ϡ���0�פ������Ƥ���������"
 
 #: g10/helptext.c:185
-#, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "���Ƥ� �桼����ID�˽�̾��������С���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 ""
-"�����Υ桼����ID�������˺����������С���yes�פ������Ƥ���������\n"
-"�����������Ʊ���˺�����ޤ�!"
+"���Υ桼����ID�������˺����������С���yes�ɤ������Ƥ���������\n"
+"�����������Ʊ���˾õ�ޤ�!"
 
 #: g10/helptext.c:194
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "�����������������硢��yes�פ������Ƥ�������"
+msgstr "���������������Ƥ褱��С���yes�ɤ������Ƥ�������"
 
 #: g10/helptext.c:199
 msgid ""
@@ -1904,8 +1946,8 @@ msgid ""
 msgstr ""
 "���ν�̾�Ȱ��פ��븰����ͭ���Ƥ��ʤ��Τǡ����ν�̾�ϸ����Ǥ��ޤ���\n"
 "���θ������Ѥ����ޤǤϡ����ʤ��Ϥ��ν�̾�κ������α����٤��Ǥ���\n"
-"�ʤ��ʤ顢���ν�̾�θ��ϡ�¾�ξ������줿���ǿ��Ѥ��ؤ�������뤫��\n"
-"����ʤ�����Ǥ���"
+"�ʤ��ʤ顢���ν�̾�θ��ϡ��⤦�������줿¾�θ��ǿ��Ѥ��ؤ��������\n"
+"���⤷��ʤ�����Ǥ���"
 
 #: g10/helptext.c:210
 msgid ""
@@ -1934,7 +1976,7 @@ msgid ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"���� (�ޤ������򤷤�) �桼����ID�������򡢸��ߤ������������ѹ�\n"
+"���� (�ޤ������򤷤�) �桼����ID�������򡢺��������������ѹ�\n"
 "���ޤ����ط����뼫�ʽ�̾�������ϡ�1�ä����ߤޤ���\n"
 
 #: g10/helptext.c:229
@@ -1951,14 +1993,14 @@ msgstr "��̾��Ԥ��ե������̾������ꤷ�Ƥ�������"
 
 #: g10/helptext.c:244
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "��񤭤��Ƥ褱��С���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 ""
-"�������ե�����̾�����Ϥ��Ƥ���������ñ�˥꥿���󡦥����򲡤��ȡ�\n"
+"�������ե�����̾�����Ϥ��Ƥ���������ñ��RETURN���ǤĤȡ�\n"
 "(��̤Ǽ�����) ����Υե�����̾����Ѥ��ޤ���"
 
 #: g10/helptext.c:255
@@ -1976,16 +2018,16 @@ 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 ""
-"���������ͳ����ꤹ��ɬ�פ�����ޤ�������ط��ˤ���ޤ�����\n"
-"�ʲ��������֤��Ȥ��Ǥ��ޤ���\n"
+"������ͳ����ꤹ�٤��Ǥ�������ط��ˤ������äơ�\n"
+"�ʲ��ΰ����������֤��Ȥ��Ǥ��ޤ���\n"
 "  �ָ����ѥ����ޤ�����\n"
 "      ǧ�ڤ���Ƥ��ʤ��ͤ���̩���ؤΥ����������������ȿ�����\n"
 "      ��­����ͳ�Τ���Ȥ��ˡ������Ȥ��ޤ���\n"
 "  �ָ����Ȥ꤫��äƤ��ޤ���\n"
-"      ���θ���ʬ�ǿ��������ȤȤ꤫�����Ȥ��˻Ȥ��ޤ���\n"
-"  �ָ��Ϥ⤦�Ȥ��Ƥ��ޤ����\n"
+"      ���θ���ʬ�ǿ��������ȸ򴹤����Ȥ��˻Ȥ��ޤ���\n"
+"  �ָ��Ϥ⤦���ѤǤ���\n"
 "      ���θ���Ȥ��Τ��᤿�Ȥ��˻Ȥ��ޤ���\n"
-"  �֥桼����ID���⤦ͭ���Ǥ���ޤ����\n"
+"  �֥桼����ID���⤦̵���Ǥ���\n"
 "      �⤦���Υ桼����ID�ϻȤ��٤��Ǥʤ����Ȥ����Ȥ��˻Ȥ�\n"
 "      �ޤ�����������̡��Żҥ᡼��Υ��ɥ쥹��̵���ˤʤä���\n"
 "      ���˻Ȥ��ޤ���\n"
@@ -1996,8 +2038,8 @@ msgid ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
-"�⤷������������С��ʤ������������ȯ�Ԥ���Τ������������\n"
-"�����Ȥ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ƥ����Ȥϴʷ�ˤ��Ƥ���������\n"
+"�⤷������������С��ʤ������������ȯ�Ԥ���Τ�����������\n"
+"ʸ�Ϥ����Ϥ��뤳�Ȥ��Ǥ��ޤ���ʸ�Ϥϴʷ�ˤ��Ƥ���������\n"
 "���Ԥǽ����ˤʤ�ޤ���\n"
 
 #: g10/helptext.c:286
@@ -2009,377 +2051,376 @@ msgstr "�إ�פϤ���ޤ���"
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "������%d�Υ֥��å��򥹥��åפ��ޤ�\n"
+msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:258
+#, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "         ��������: %lu\n"
+msgstr "    ��������: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr " �����åפ�����������: %lu\n"
+msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "       �桼����ID�ʤ�: %lu\n"
+msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
-msgstr "               �ɹ���: %lu"
+msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "             �ѹ��ʤ�: %lu\n"
+msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "     �������桼����ID: %lu\n"
+msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "           ����������: %lu\n"
+msgstr "      ����������: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "           ��������̾: %lu\n"
+msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "       �����������: %lu\n"
+msgstr "  �����������: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "       ��̩�����ɽФ�: %lu\n"
+msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "       ��̩�����ɹ���: %lu\n"
+msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "       ̵�ѹ�����̩��: %lu\n"
+msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
-msgstr "             ̤�ɹ���: %lu\n"
+msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:545
-#, fuzzy
+#: g10/import.c:547
 msgid "algorithms on these user IDs:\n"
-msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
+msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:596
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
+"����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, 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:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:695 g10/import.c:1049
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "��%08lX: �桼����ID������ޤ���\n"
+msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:715
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "��%08lX: HKP��������¤����\n"
+msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:730
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "��%08lX: ��������̤���ʽ�̾�Υ桼����ID '%s'\n"
+msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:736
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "��%08lX: ͭ���ʥ桼����ID������ޤ���\n"
+msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:748 g10/import.c:1170
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "��%08lX: �����������Ĥ���ޤ���: %s\n"
+msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:754
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "�� %08lX: ���������Ǥ� - �����å�\n"
+msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "��%s�פؤν�Ф�\n"
+msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:793
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "��%08lX: ��������%s�פ��ɤ߹��ߤޤ���\n"
+msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:817
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "��%08lX: �������ʣ���ȹ礤�ޤ���\n"
+msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:834 g10/import.c:1188
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "��%08lX: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
+msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:842 g10/import.c:1195
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "��%08lX: ���θ��֥��å����ɤ߹���ޤ���: %s\n"
+msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:874
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "��%08lX: ��%s�׿������桼����ID��1��\n"
+msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:877
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "��%08lX: ��%s�׿������桼����ID��%d��\n"
+msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:880
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "��%08lX: ��%s�׿�������̾��1��\n"
+msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:883
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "��%08lX: ��%s�׿�������̾��%d��\n"
+msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:886
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "��%08lX: ��%s�׿�����������1��\n"
+msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:889
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "��%08lX: ��%s�׿�����������%d��\n"
+msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:910
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "��%08lX: ��%s���ѹ��ʤ�\n"
+msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1055
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "��%08lX: ̵���ʰŹ�%d����̩���Ǥ� - �����å�\n"
+msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1066
 msgid "importing secret keys not allowed\n"
-msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1094
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "��%08lX: ��̩�����ɤ߹��ߤޤ���\n"
+msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1123
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "��%08lX: ������̩���ؤˤ���ޤ�\n"
+msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1133
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "��%08lX: ��̩�������Ĥ���ޤ���: %s\n"
+msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1163
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "��%08lX: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
+msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1206
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "��%08lX: ̵���ʼ���������: %s - ����\n"
+msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1238
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "��%08lX: ��%s�׼�����������ɤ߹��ߤޤ���\n"
+msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1303
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "��%08lX: ��̾���б�����桼����ID������ޤ���\n"
+msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1318
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "��%08lX: �桼����id��%s�פΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
+msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1320
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "��%08lX: �桼����id��%s�פμ��ʽ�̾����̵���Ǥ�\n"
+msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1338
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "��%08lX: �����б���������������ޤ���\n"
+msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1349 g10/import.c:1399
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "��%08lX: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
+msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1351
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "��%08lX: ̵�����������б��Ǥ�\n"
+msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1366
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "��%08lX: ¿���������б��������ޤ�\n"
+msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1388
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "��%08lX: �������ˤ�����������������ޤ���\n"
+msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1401
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "��%08lX: ̵�������������Ǥ�\n"
+msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1416
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "��%08lX: ̵���������μ����������ޤ�\n"
+msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1458
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "��%08lX: �����åפ����桼����ID '"
+msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1479
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "��%08lX: �����åפ�������\n"
+msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1504
-#, fuzzy, c-format
+#: g10/import.c:1506
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "��%08lX: ��Ф��ԲĤʽ�̾ (���饹%02x) - �����å�\n"
+msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1516
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "��%08lX: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �����å�\n"
+msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1533
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "��%08lX: ̵���ʼ���������: %s - �����å�\n"
+msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1547
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "��%08lX: ������̾�ξ�꤬�����äƤ��ޤ� - �����å�\n"
+msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1555
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "��%08lX: ͽ�����̽�̾���饹 (0x%02X) - �����å�\n"
+msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1653
-#, fuzzy, c-format
+#: g10/import.c:1655
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "��%08lX: ��ʣ�����桼����ID�θ��� - ʻ��\n"
+msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1715
-#, fuzzy, c-format
+#: g10/import.c:1717
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX�ΰ����Ф�\n"
+msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1729
-#, fuzzy, c-format
+#: g10/import.c:1731
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
+msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1788
-#, fuzzy, c-format
+#: g10/import.c:1790
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "��%08lX: ��%s�׼�����������ɲ�\n"
+msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1822
-#, fuzzy, c-format
+#: g10/import.c:1824
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "��%08lX: ľ�ܸ���̾���ɲ�\n"
+msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
 #: g10/keydb.c:167
 #, c-format
@@ -2406,12 +2447,12 @@ msgstr "[���ʽ�̾]"
 
 #: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
-msgstr "̵���ʽ�̾1��\n"
+msgstr "�����ʽ�̾1��\n"
 
 #: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "̵���ʽ�̾%d��\n"
+msgstr "�����ʽ�̾%d��\n"
 
 #: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
@@ -2441,26 +2482,25 @@ msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
 #: g10/keyedit.c:402 g10/pkclist.c:262
-#, fuzzy
 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 ""
-"¾�Υ桼�����θ������������ڤ��뤿��ˡ����Υ桼�����ο����٤����\n"
-"��������(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺�������...)?\n"
-"\n"
+"¾�Υ桼�����θ������������ڤ��뤿��ˡ����Υ桼�����ο����٤���Ƥ�����"
+"��\n"
+"(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
 #: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = �������ٿ��Ѥ���\n"
+msgstr "  %d = �������ٿ��Ѥ���\n"
 
 #: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = �����˿��Ѥ���\n"
+msgstr "  %d = �����˿��Ѥ���\n"
 
 #: g10/keyedit.c:426
 msgid ""
@@ -2468,15 +2508,17 @@ msgid ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
+"������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
 #: g10/keyedit.c:442
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr ""
+msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
 #: g10/keyedit.c:584
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
+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:1486
@@ -2491,12 +2533,12 @@ msgstr "  ��̾��ǽ��\n"
 #: g10/keyedit.c:610
 #, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "�桼����ID��%s�פϡ������ڤ�Ǥ���"
+msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
 #: g10/keyedit.c:636
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "�桼����ID��%s�פϡ����ʽ�̾����Ƥ��ޤ���"
+msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
 #: g10/keyedit.c:675
 #, c-format
@@ -2504,7 +2546,7 @@ msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"\"%s\" �ˤ������뼫�ʽ�̾�ϡ�\n"
+"��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
 #: g10/keyedit.c:684
@@ -2517,12 +2559,12 @@ msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"��%s�פˤ������뺣�Τ��ʤ��ν�̾��\n"
-"�����ڤ�Ǥ���\n"
+"��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
+"����λ�Ǥ���\n"
 
 #: g10/keyedit.c:702
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "�����ڤ��̾�򿷤�����̾�ȸ򴹤������Ǥ���? (y/N) "
+msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
 #: g10/keyedit.c:723
 #, c-format
@@ -2530,50 +2572,50 @@ msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"\"%s\" �ˤ������뺣�Τ��ʤ��ν�̾��\n"
-"������̾�Ǥ���\n"
+"��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
+"��������̾�Ǥ���\n"
 
 #: g10/keyedit.c:727
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
 #: g10/keyedit.c:748
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦������̾���Ƥ���ޤ�\n"
+msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
 #: g10/keyedit.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "\"%s\" �ϸ�%08lX�Ǥ⤦��̾���Ƥ���ޤ�\n"
+msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
 #: g10/keyedit.c:756
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "����Ǥ��̾�������Ǥ���? (y/N) "
+msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
 #: g10/keyedit.c:778
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "��%08lX�ǽ�̾�����ΤϤ���ޤ���\n"
+msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
 #: g10/keyedit.c:793
 msgid "This key has expired!"
-msgstr "���θ��ϴ����ڤ�Ǥ�!"
+msgstr "���θ�����λ�Ǥ�!"
 
 #: g10/keyedit.c:813
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "���θ���%s�Ǵ��¤��ڤ�ޤ���\n"
+msgstr "���θ���%s����λ���ޤ���\n"
 
 #: g10/keyedit.c:817
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "Ʊ���˽�̾������ڤ�ˤ������Ǥ���? (Y/n) "
+msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
 #: g10/keyedit.c:850
 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"
+msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
 
 #: g10/keyedit.c:852
 msgid "This would make the key unusable in PGP 2.x.\n"
@@ -2586,7 +2628,7 @@ msgid ""
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
-"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�פ����Ϥ��Ƥ���������\n"
+"���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
 #: g10/keyedit.c:882
 #, c-format
@@ -2609,78 +2651,56 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
-msgstr "�����? (�ܺ٤ϡ�?�פ�): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
+msgstr "�����? (�ܺ٤� '?' ��): "
 
 #: g10/keyedit.c:918
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
-msgstr "�����ˤ��θ��ˤ��ʤ��θ��ǽ�̾���Ƥ褤�Ǥ���: \""
+msgstr ""
+"�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
+"(%s)\n"
 
 #: g10/keyedit.c:925
-#, fuzzy
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"���ʽ�̾�ˤʤ�Ǥ��礦��\n"
+msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
 #: g10/keyedit.c:931
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
+msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
 #: g10/keyedit.c:939
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
+msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
 #: g10/keyedit.c:949
-#, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
+msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
 #: g10/keyedit.c:956
-#, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"��̾�ϼ����ԲĤ����ꤵ��ޤ���\n"
+msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
 #: g10/keyedit.c:963
-#, fuzzy
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"���θ����������������Ƥ��ޤ���\n"
+msgstr "���θ����������������Ƥ��ޤ���\n"
 
 #: g10/keyedit.c:968
-#, fuzzy
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"���θ��ϰ�����������ޤ�����\n"
+msgstr "���θ��ϰ�����������ޤ�����\n"
 
 #: g10/keyedit.c:973
-#, fuzzy
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
+msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
 #: g10/keyedit.c:983
-#, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "�����˽�̾���ޤ���? "
+msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2711,7 +2731,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
@@ -2721,13 +2741,12 @@ msgid ""
 "\n"
 msgstr ""
 "�ѥ��ե졼������ɬ�פʤ褦�Ǥ�����\n"
-"�����餯����Ϥ����ʹͤ��ǤϤ���ޤ���!\n"
+"�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
 #: g10/keyedit.c:1135
-#, fuzzy
 msgid "Do you really want to do this? (y/N) "
-msgstr "�����˼¹Ԥ��ޤ���? "
+msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
 #: g10/keyedit.c:1201
 msgid "moving a key signature to the correct place\n"
@@ -2794,14 +2813,12 @@ msgid "s"
 msgstr "s"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "tsign"
-msgstr "sign"
+msgstr "tsign"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "make a trust signature"
-msgstr "ʬΥ��̾�����"
+msgstr "���ѽ�̾�����"
 
 #: g10/keyedit.c:1260
 msgid "lsign"
@@ -2864,21 +2881,20 @@ msgid "add a secondary key"
 msgstr "�������ɲ�"
 
 #: g10/keyedit.c:1271
-#, fuzzy
 msgid "addcardkey"
-msgstr "addkey"
+msgstr "addcardkey"
 
 #: g10/keyedit.c:1271
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
 #: g10/keyedit.c:1272
 msgid "keytocard"
-msgstr ""
+msgstr "keytocard"
 
 #: g10/keyedit.c:1272
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
 #: g10/keyedit.c:1274
 msgid "delkey"
@@ -2910,7 +2926,7 @@ msgstr "expire"
 
 #: g10/keyedit.c:1277
 msgid "change the expire date"
-msgstr "ͭ�����¤��ѹ�"
+msgstr "��λ�����ѹ�"
 
 #: g10/keyedit.c:1278
 msgid "primary"
@@ -2926,7 +2942,7 @@ msgstr "toggle"
 
 #: g10/keyedit.c:1279
 msgid "toggle between secret and public key listing"
-msgstr "��̩���ȸ������ΰ��������ؤ�"
+msgstr "��̩���ȸ������ΰ�����ȿž"
 
 #: g10/keyedit.c:1281
 msgid "t"
@@ -2965,14 +2981,12 @@ msgid "updated preferences"
 msgstr "�����ΰ����򹹿�"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "keyserver"
-msgstr "�������С��Υ��顼"
+msgstr "keyserver"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "set preferred keyserver URL"
-msgstr "�������С���URI�������ǽ\n"
+msgstr "��������������URI������"
 
 #: g10/keyedit.c:1287
 msgid "change the passphrase"
@@ -3035,9 +3049,9 @@ msgid "show photo ID"
 msgstr "�ե���ID��ɽ��"
 
 #: g10/keyedit.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "��̩���֥��å���%s�פ��ɹ��ߥ��顼: %s\n"
+msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
 #: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
@@ -3049,16 +3063,15 @@ msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
 #: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
+msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
 #: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
 #: g10/keyedit.c:1500
-#, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "���������桼����ID�˽�̾���ޤ���? "
+msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
 #: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
@@ -3067,7 +3080,7 @@ msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 #: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
+msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
 #: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
@@ -3078,88 +3091,75 @@ msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
 #: g10/keyedit.c:1553
-#, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
+msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
 #: g10/keyedit.c:1554
-#, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "���Υ桼����ID�������˺�����ޤ���? "
+msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
 #: g10/keyedit.c:1604
-#, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "���Υ桼����ID�������˺�����ޤ���? "
+msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
 #: g10/keyedit.c:1616
-#, fuzzy
 msgid "You must select exactly one key.\n"
-msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
+msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
 #: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
-msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
+msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
 #: g10/keyedit.c:1639
-#, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "���򤷤����������˺�����ޤ���? "
+msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
 #: g10/keyedit.c:1640
-#, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "���θ��������˺�����ޤ���? "
+msgstr "���θ��������˺�����ޤ���? (y/N) "
 
 #: g10/keyedit.c:1675
-#, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "���򤷤����桼����ID�������˼������ޤ���? "
+msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
 #: g10/keyedit.c:1676
-#, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "���Υ桼����ID�������˼������ޤ���? "
+msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
 #: g10/keyedit.c:1695
-#, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "���򤷤����������˼������ޤ���? "
+msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
 #: g10/keyedit.c:1696
-#, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
-msgstr "���θ��������˼������ޤ���? "
+msgstr "���θ��������˼������ޤ���? (y/N) "
 
 #: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
+"���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
+"����\n"
 
 #: g10/keyedit.c:1767
-#, fuzzy
 msgid "Set preference list to:\n"
-msgstr "�������������"
+msgstr "�������������:\n"
 
 #: g10/keyedit.c:1773
-#, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
+msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
 #: g10/keyedit.c:1775
-#, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "�����������˹������ޤ���? "
+msgstr "�����������˹������ޤ���? (y/N) "
 
 #: g10/keyedit.c:1825
-#, fuzzy
 msgid "Save changes? (y/N) "
-msgstr "�ѹ�����¸���ޤ���? "
+msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
 #: g10/keyedit.c:1828
-#, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "��¸�����˽�λ���ޤ���? "
+msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
 #: g10/keyedit.c:1838
 #, c-format
@@ -3169,11 +3169,11 @@ msgstr "�����˼��Ԥ��ޤ���: %s\n"
 #: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
+msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
 #: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
-msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
+msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
 #: g10/keyedit.c:1924
 msgid "Digest: "
@@ -3185,105 +3185,98 @@ msgstr "��ǽ: "
 
 #: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "̵�����������С�"
 
 #: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "������������: "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, c-format
-msgid "This key may be revoked by %s key "
-msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
+msgid "This key may be revoked by %s key %s"
+msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
-msgstr " (�ǥꥱ����)"
+#: g10/keyedit.c:2251
+msgid "(sensitive)"
+msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
-#, fuzzy, c-format
+#, c-format
 msgid "created: %s"
-msgstr "%s������Ǥ��ޤ���: %s\n"
+msgstr "����: %s"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#, c-format
 msgid "revoked: %s"
-msgstr "[����] "
+msgstr "����: %s"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
-#, fuzzy, c-format
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#, c-format
 msgid "expired: %s"
-msgstr " [ͭ������: %s]"
+msgstr "��λ: %s"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
+#, c-format
 msgid "expires: %s"
-msgstr " [ͭ������: %s]"
+msgstr "��λ: %s"
 
-#: g10/keyedit.c:2270
-#, fuzzy, c-format
+#: g10/keyedit.c:2276
+#, c-format
 msgid "usage: %s"
-msgstr " trust: %c/%c"
+msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2285
-#, fuzzy, c-format
+#: g10/keyedit.c:2291
+#, c-format
 msgid "trust: %s"
-msgstr " trust: %c/%c"
+msgstr "����: %s"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
-msgstr ""
+msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[����] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
-"�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
+"�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+msgid "revoked"
+msgstr "����"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+msgid "expired"
+msgstr "��λ"
+
+#: g10/keyedit.c:2536
 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������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
+"�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3292,45 +3285,45 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
+msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3339,187 +3332,179 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
+msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2968
-#, fuzzy
+#: g10/keyedit.c:2965
 msgid "this key has already been designated as a revoker\n"
-msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:2993
-#, fuzzy
+#: g10/keyedit.c:2990
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "�����ˤ��θ����̾�����Ԥ����ꤷ�ޤ���? (y/N): "
+msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
-#, fuzzy, c-format
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "�桼����id��%s�פ�v3���ʽ�̾��ȤФ��ޤ�\n"
+msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3498
-#, fuzzy
+#: g10/keyedit.c:3495
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
+msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3499
-#, fuzzy
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
+msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3724
-#, fuzzy, c-format
+#: g10/keyedit.c:3721
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "�桼����ID: \""
+msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
-#, fuzzy, c-format
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
+msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
+msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
+msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:3768
-#, fuzzy, c-format
+#: g10/keyedit.c:3765
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
+msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:3794
-#, fuzzy
+#: g10/keyedit.c:3791
 msgid " (non-revocable)"
-msgstr " (��Ф��Բ�)"
+msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:3801
-#, fuzzy, c-format
+#: g10/keyedit.c:3798
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   %08lX��%s�˼�������Ƥ��ޤ�\n"
+msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "����������������˺��ޤ���? (y/N) "
+msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4129
-#, fuzzy, c-format
+#: g10/keyedit.c:4126
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
+msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
 
 #: g10/keygen.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "����%c%lu�ν�ʣ\n"
+msgstr "������%s�פν�ʣ\n"
 
 #: g10/keygen.c:300
-#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "¿�������%c������\n"
+msgstr "¿������Ź�ˡ����\n"
 
 #: g10/keygen.c:302
-#, fuzzy
 msgid "too many digest preferences\n"
-msgstr "¿�������%c������\n"
+msgstr "¿��������������\n"
 
 #: g10/keygen.c:304
-#, fuzzy
 msgid "too many compression preferences\n"
-msgstr "¿�������%c������\n"
+msgstr "¿�����밵������\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "����ʸ�����̵����ʸ��������ޤ�\n"
+msgstr "����ʸ�����̵���ʹ��ܡ�%s�פ�����ޤ�\n"
 
 #: g10/keygen.c:827
 msgid "writing direct signature\n"
@@ -3533,71 +3518,69 @@ msgstr "���ʽ�̾��񤭹��ߤޤ�\n"
 msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "̵���ʸ���������%u�ӥåȤˤ��ޤ�\n"
+msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "����������%u�ӥåȤ˴ݤ�ޤ�\n"
+msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
 
 #: g10/keygen.c:1247
-#, fuzzy
 msgid "Sign"
-msgstr "sign"
+msgstr "Sign"
 
 #: g10/keygen.c:1250
-#, fuzzy
 msgid "Encrypt"
-msgstr "�ǡ�����Ź沽"
+msgstr "Encrypt"
 
 #: g10/keygen.c:1253
 msgid "Authenticate"
-msgstr ""
+msgstr "Authenticate"
 
 #: g10/keygen.c:1261
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsEeAaQq"
 
 #: g10/keygen.c:1276
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "��%s�˲�ǽ�����: "
 
 #: g10/keygen.c:1280
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "������ǽ�����: "
 
 #: g10/keygen.c:1285
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "   (%c) ��̾�Ϥ�ȿž\n"
 
 #: g10/keygen.c:1288
-#, fuzzy, c-format
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
+msgstr "   (%c) �Ź��Ϥ�ȿž\n"
 
 #: g10/keygen.c:1291
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "   (%c) ǧ���Ϥ�ȿž\n"
 
 #: g10/keygen.c:1294
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "   (%c) ��λ\n"
 
 #: g10/keygen.c:1348
 msgid "Please select what kind of key you want:\n"
-msgstr "�����ʸ��μ�������򤷤Ƥ�������:\n"
+msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
 #: g10/keygen.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA��ElGamal (����)\n"
+msgstr "   (%d) DSA��Elgamal (����)\n"
 
 #: g10/keygen.c:1351
 #, c-format
@@ -3606,90 +3589,60 @@ msgstr "   (%d) DSA (��̾�Τ�)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
+
+#: g10/keygen.c:1355
+#, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (�Ź沽�Τ�)\n"
+msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1358
-#, fuzzy, c-format
-msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
-
-#: g10/keygen.c:1409
+#: g10/keygen.c:1360
 #, c-format
-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���Ф��������ޤ���\n"
-"             �Ǿ��θ�Ĺ��  768 �ӥå�\n"
-"             ����θ�Ĺ�� 1024 �ӥå�\n"
-"         ����ο侩��Ĺ�� 2048 �ӥå�\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
+msgid "   (%d) RSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
-"�侩���ޤ���!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "���θ�Ĺ�������ˤ����Ǥ���? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ������Ϥϡ�\n"
-"����ˤ��������ȼ�Ǥ��뤳�Ȥ򿴤�α��Ƥ����Ƥ�������!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3698,14 +3651,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"����ͭ�����¤���Ƥ���������\n"
-"         0 = ̵����\n"
-"      <n>  = ͭ������ n ����\n"
-"      <n>w = ͭ������ n ����\n"
-"      <n>m = ͭ������ n �����\n"
-"      <n>y = ͭ������ n ǯ��\n"
-
-#: g10/keygen.c:1525
+"����ͭ�����¤���ꤷ�Ƥ���������\n"
+"         0 = ����̵����\n"
+"      <n>  = ���� n ���֤���λ\n"
+"      <n>w = ���� n ���֤���λ\n"
+"      <n>m = ���� n ����֤���λ\n"
+"      <n>y = ���� n ǯ�֤���λ\n"
+
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3714,50 +3667,48 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"��̾��ͭ�����¤���Ƥ���������\n"
-"         0 = ̵����\n"
-"      <n>  = ͭ������ n ����\n"
-"      <n>w = ͭ������ n ����\n"
-"      <n>m = ͭ������ n �����\n"
-"      <n>y = ͭ������ n ǯ��\n"
-
-#: g10/keygen.c:1547
+"��̾��ͭ�����¤���ꤷ�Ƥ���������\n"
+"         0 = ��̾��̵����\n"
+"      <n>  = ��̾�� n ���֤���λ\n"
+"      <n>w = ��̾�� n ���֤���λ\n"
+"      <n>m = ��̾�� n ����֤���λ\n"
+"      <n>y = ��̾�� n ǯ�֤���λ\n"
+
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
-msgstr "%s��%s�ˤƴ����ڤ�ˤʤ�ޤ�\n"
+msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
-"2106ǯ�ޤǤʤ������������Ǥ��ޤ���\n"
+"2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1577
-#, fuzzy
+#: g10/keygen.c:1589
 msgid "Is this correct? (y/N) "
-msgstr "����Ǥ����Ǥ��� (y/n)? "
+msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1620
-#, fuzzy
+#: g10/keygen.c:1632
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3773,44 +3724,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "���ʤ���ʸ������`%s'��ȤäƤ��ޤ���\n"
+msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3818,30 +3769,30 @@ msgid ""
 "\n"
 msgstr ""
 "���Υ桼����ID�����򤷤ޤ���:\n"
-"    \"%s\"\n"
+"    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1750
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3849,24 +3800,24 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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 ""
-"�ѥ��ե졼������ɬ�פʤ褦�Ǥ����������餯����Ϥ����ʹͤ��Ǥ�\n"
-"����ޤ���! ��������³�Ԥ��ޤ����ѥ��ե졼���ϡ����Υץ������\n"
-"�Ρ�--edit-key�ץ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
+"�ѥ��ե졼������ɬ�פʤ褦�Ǥ����������餯����Ϥ����Ǥ�ʤ�\n"
+"�ͤ��Ǥ�! ��������³�Ԥ��ޤ����ѥ��ե졼���ϡ����Υץ������\n"
+"�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3875,117 +3826,112 @@ msgid ""
 msgstr ""
 "������Ĺ��������������ޤ��������ܡ��ɤ��ǤĤȤ����ޥ�����ư����\n"
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
-"�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤷ�ޤ���\n"
-
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
+"�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
-msgstr "������������ߤ���ޤ�����\n"
+msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
-#, fuzzy, c-format
+#: g10/keygen.c:2761 g10/keygen.c:2899
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "��������`%s'�ν���ߥ��顼: %s\n"
+msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
-msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
+msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
 msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
-"��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
+"��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
+msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
+msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
-#, fuzzy
+#: g10/keygen.c:3052 g10/keygen.c:3174
 msgid "Really create? (y/N) "
-msgstr "�����˺��ޤ���? "
+msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3315
-#, fuzzy, c-format
+#: g10/keygen.c:3327
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
+msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3362
-#, fuzzy, c-format
+#: g10/keygen.c:3374
+#, c-format
 msgid "can't create backup file `%s': %s\n"
-msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
+msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3385
-#, fuzzy, c-format
+#: g10/keygen.c:3397
+#, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
+msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "RSA��ˡ(modulus)��Ĺ����%d�Ǥ���ޤ���\n"
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, 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     "
@@ -4001,11 +3947,11 @@ msgstr "��̾�ݥꥷ��: "
 
 #: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "����������������: "
 
 #: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
-msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
+msgstr "�ٹ�: ̵��������ǡ�����ȯ��\n"
 
 #: g10/keylist.c:309
 msgid "Critical signature notation: "
@@ -4024,39 +3970,38 @@ msgid "Keyring"
 msgstr "����"
 
 #: g10/keylist.c:729
-#, fuzzy, c-format
+#, c-format
 msgid "expired: %s)"
-msgstr " [ͭ������: %s]"
+msgstr "��λ: %s)"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
-#, fuzzy
+#: g10/keylist.c:1440 g10/keylist.c:1444
 msgid "      Key fingerprint ="
-msgstr "                ���� ="
+msgstr "                 ���� ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "         �����ɤ����� ="
 
 #: g10/keyring.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "�����˼��Ԥ��ޤ���: %s\n"
+msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
@@ -4074,22 +4019,22 @@ msgstr "%s�Ͽ��������Ǥ�\n"
 
 #: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
-msgstr "���ΰ�����η�٤������Ƥ�������\n"
+msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
 #: g10/keyring.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "���ء�%s�פ򸡺����Ƥ��ޤ�\n"
+msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
 #: g10/keyring.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
 #: g10/keyring.c:1433
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
+msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
 #: g10/keyring.c:1504
 #, c-format
@@ -4097,137 +4042,131 @@ msgid "%s: keyring created\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 "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
+msgstr ""
+"�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
 #: g10/keyserver.c:378
-#, fuzzy
 msgid "disabled"
-msgstr "disable"
+msgstr "disabled"
 
 #: g10/keyserver.c:579
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
 #: g10/keyserver.c:662 g10/keyserver.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
 #: g10/keyserver.c:752
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
+msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
 #: g10/keyserver.c:754
-#, fuzzy
 msgid "key not found on keyserver\n"
-msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
+msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
 #: g10/keyserver.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "��%08lX��%s���׵�\n"
+msgstr "��%s��%s���饵���С�%s���׵�\n"
 
 #: g10/keyserver.c:900
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "��%08lX��%s���׵�\n"
+msgstr "��%s��%s���׵�\n"
 
 #: g10/keyserver.c:1045
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "��%s�פ�HKP�����С�%s���鸡��\n"
+msgstr "��%s��%s������%s������\n"
 
 #: g10/keyserver.c:1049
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"\"\n"
-"���ʤ��θ�%08lX��%s�˽�̾����Ƥ��ޤ�\n"
+msgstr "��%s��%s������\n"
 
 #: g10/keyserver.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "��%s�פ�HKP�����С�%s���鸡��\n"
+msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
 #: g10/keyserver.c:1095
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "��%s�פ�HKP�����С�%s���鸡��\n"
+msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
 #: g10/keyserver.c:1102 g10/keyserver.c:1197
-#, fuzzy
 msgid "no keyserver action!\n"
-msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
+msgstr "�������С�����������󤬤���ޤ���!\n"
 
 #: g10/keyserver.c:1150
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
+msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
 #: g10/keyserver.c:1159
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
 #: g10/keyserver.c:1218
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
 #: g10/keyserver.c:1224
 msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
+msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: g10/keyserver.c:1236
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
 #: g10/keyserver.c:1241
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
+msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
 #: g10/keyserver.c:1249
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
 #: g10/keyserver.c:1254
-#, fuzzy
 msgid "keyserver timed out\n"
-msgstr "�������С��Υ��顼"
+msgstr "�������С��Υ����ॢ����\n"
 
 #: g10/keyserver.c:1259
-#, fuzzy
 msgid "keyserver internal error\n"
-msgstr "�������С��Υ��顼"
+msgstr "�������С����������顼\n"
 
 #: g10/keyserver.c:1268
-#, fuzzy, c-format
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
+msgstr "�������С��̿����顼: %s\n"
 
 #: g10/keyserver.c:1293 g10/keyserver.c:1327
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
 #: g10/keyserver.c:1578
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) `%s': %s\n"
+msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
 #: g10/keyserver.c:1600
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "��%08lX��%s���׵�\n"
+msgstr "1�ܤθ���%s�������\n"
 
 #: g10/keyserver.c:1602
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "��%08lX��%s���׵�\n"
+msgstr "%d�ܤθ���%s�������\n"
 
 #: g10/mainproc.c:248
 #, c-format
@@ -4245,33 +4184,33 @@ msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "̤�ΤΥ��르�ꥺ��ˤ��Ź� %d\n"
+msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
 #: g10/mainproc.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "public key is %s\n"
-msgstr "��������%08lX�Ǥ�\n"
+msgstr "��������%s�Ǥ�\n"
 
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "�������ǰŹ沽���줿�ǡ���: ������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 "%u-�ӥå�%s��, ID %08lX�ǰŹ沽%s�ˤǤ��ޤ���\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 "       ��̾ \""
+msgstr "      ��%s��\n"
 
 #: g10/mainproc.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "%s��, ID %08lX�ǰŹ沽����ޤ���\n"
+msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
 #: g10/mainproc.c:483
 #, c-format
@@ -4290,12 +4229,12 @@ msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 #: g10/mainproc.c:527 g10/mainproc.c:549
 #, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "%s�Ź沽���줿�ǡ�������\n"
+msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
 #: g10/mainproc.c:535
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA�Ź��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
+msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
 #: g10/mainproc.c:567
 msgid "decryption okay\n"
@@ -4316,7 +4255,7 @@ msgstr "����˼��Ԥ��ޤ���: %s\n"
 
 #: g10/mainproc.c:610
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "����: �����Ԥϡ����ˤ���פ褦�˵��Ƥ��ޤ�\n"
+msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
 #: g10/mainproc.c:612
 #, c-format
@@ -4325,7 +4264,7 @@ msgstr "���Υե�����̾='%.*s'\n"
 
 #: g10/mainproc.c:784
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "��Ω��������gpg --import�פ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
+msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
 #: g10/mainproc.c:1288
 msgid "signature verification suppressed\n"
@@ -4336,47 +4275,47 @@ msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
 #: g10/mainproc.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s\n"
-msgstr "�����ڤ�ν�̾ %s\n"
+msgstr "%s�˻ܤ��줿��̾\n"
 
 #: g10/mainproc.c:1351
-#, fuzzy, c-format
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "       ��̾ \""
+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 ��%s��ID %08lX�ˤ���̾\n"
+msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
 #: g10/mainproc.c:1375
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
 #: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "������ ��̾: \""
+msgstr "��%s�ɤ���� ������ ��̾"
 
 #: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "�����ڤ�ν�̾: \""
+msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
 #: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "��������̾: \""
+msgstr "��%s�ɤ������������̾"
 
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
 #: g10/mainproc.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "                aka \"%s\""
-msgstr "       ��̾ \""
+msgstr "                ��̾��%s��"
 
 #: g10/mainproc.c:1662
 #, c-format
@@ -4386,7 +4325,7 @@ msgstr "�����ڤ�ν�̾ %s\n"
 #: g10/mainproc.c:1667
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ�\n"
+msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
 #: g10/mainproc.c:1670
 #, c-format
@@ -4401,7 +4340,7 @@ msgstr "�Х��ʥ꡼"
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "̤�Τ�"
 
@@ -4430,36 +4369,46 @@ msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
 #: g10/mainproc.c:1878
 msgid "invalid root packet detected in proc_tree()\n"
-msgstr "proc_tree() �����̵���ʥѥ��åȤ򸡽Ф��ޤ���\n"
+msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "����������פ�̵���ˤǤ��ޤ���: %s\n"
+msgstr "����������פ���ѶػߤˤǤ��ޤ���: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
-#, fuzzy, c-format
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "�ե����뤬�����ޤ���: %s\n"
+msgstr "��%s�פ�fstat��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:186
-#, fuzzy, c-format
+#: g10/misc.c:190
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "���ѥǡ����١���: �ɽФ��˼��� (n=%d): %s\n"
+msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"���ΰŹ楢�르�ꥺ��ϡ�����뤵��Ƥ��ޤ���\n"
-"��ä�ɸ��Ū�ʥ��르�ꥺ����Ѥ��Ƥ�������!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "̤�����ΰŹ楢�르�ꥺ��Ǥ�"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA�Ź�Υץ饰���󤬤���ޤ���\n"
+msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
 #: g10/misc.c:431
 msgid ""
@@ -4469,41 +4418,40 @@ msgstr "�ܺ٤ϡ�http://www.gnupg.org/why-not-idea.html������������\n"
 #: g10/misc.c:664
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
+msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
 #: g10/misc.c:668
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "�ٹ�: ��%s�פϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
+msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
 #: g10/misc.c:670
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "��%s%s�פ�����˻ȤäƤ�������\n"
+msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
 #: g10/misc.c:681
 msgid "Uncompressed"
-msgstr "̤����"
+msgstr "̵����"
 
 #: g10/misc.c:706
-#, fuzzy
 msgid "uncompressed|none"
-msgstr "̤����"
+msgstr "̵����|�ʤ�"
 
 #: g10/misc.c:816
 #, c-format
 msgid "this message may not be usable by %s\n"
-msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ʤ����⤷��ޤ���\n"
+msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
 #: g10/misc.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "��%s�פ��饪�ץ������ɤ߹��ߤޤ�\n"
+msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
 #: g10/misc.c:998
-#, fuzzy, c-format
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "����μ���͡�%s�פ����Ĥ���ޤ���\n"
+msgstr "̤�ΤΥ��ץ�����%s��\n"
 
 #: g10/openfile.c:84
 #, c-format
@@ -4511,9 +4459,8 @@ msgid "File `%s' exists. "
 msgstr "�ե������%s�פϴ���¸�ߤ��ޤ���"
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "��񤭤��ޤ��� (y/N)? "
+msgstr "��񤭤��ޤ���? (y/N) "
 
 #: g10/openfile.c:119
 #, c-format
@@ -4526,17 +4473,17 @@ msgstr "�������ե�����̾�����Ϥ��Ƥ�������"
 
 #: g10/openfile.c:184
 msgid "writing to stdout\n"
-msgstr "ɸ����Ϥ˽񤭽Ф��ޤ�\n"
+msgstr "ɸ����Ϥ˽񤭹��ߤޤ�\n"
 
 #: g10/openfile.c:296
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "��̾���줿�ǡ�����`%s'�ˤ�������ꤷ�ޤ�\n"
+msgstr "��̾���줿�ǡ�������%s�פˤ�������ꤷ�ޤ�\n"
 
 #: g10/openfile.c:375
 #, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "�����������ե�����`%s'���Ǥ��ޤ���\n"
+msgstr "�����������ե������%s�פ��Ǥ��ޤ���\n"
 
 #: g10/openfile.c:377
 #, c-format
@@ -4544,69 +4491,69 @@ msgid "WARNING: options in `%s' are not yet active during this run\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
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "�������Υ��르�ꥺ��%d�ϻ��ѤǤ��ޤ���\n"
+msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
 #: g10/parse-packet.c:688
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ楻�å���󸰤Ǥ�\n"
+msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
 #: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "������%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
+msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
-msgstr "���Υ��å�����gpg����������Ȥ�̵���Ǥ�\n"
+msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "����������ȤΥ��饤�����pid������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "������������ѤΥ����С��ɽФ�FD������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "������������ѤΥ����С������FD������Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
+msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
-#, fuzzy, c-format
+#: g10/passphrase.c:698 g10/passphrase.c:1203
+#, c-format
 msgid " (main key ID %s)"
-msgstr " (�縰ID %08lX)"
+msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:698
-#, fuzzy, c-format
+#: g10/passphrase.c:712
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
 "\"%.*s\"\n"
@@ -4614,63 +4561,61 @@ msgid ""
 msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤϥѥ��ե졼��������ޤ�:\n"
 "\"%.*s\"\n"
-"%u�ӥå�%s��, ID %08lX�������դ�%s%s\n"
+"%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
-msgstr "�ѥ��ե졼����Ĺ�᤮�ޤ�\n"
+msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "����������Ȥ����̵���ʱ���\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
-#, fuzzy
-msgid "can't query password in batch mode\n"
-msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
+msgid "can't query passphrase in batch mode\n"
+msgstr "�Хå����⡼�ɤǥѥ��ե졼������礻�Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:1141
-#, fuzzy, c-format
+#: g10/passphrase.c:1184
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr ""
-"\n"
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
-"�ѥ��ե졼��������ޤ�: \""
+"�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:1147
-#, fuzzy, c-format
+#: g10/passphrase.c:1190
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
+msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "         (�縰ID %s ������)"
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -4686,29 +4631,28 @@ msgstr ""
 "���ʤ��Υե���ID�˻Ȥ���������Ƥ���������������JPEG�ե�����Ǥ���ɬ\n"
 "�פ�����ޤ��������ϸ������Ȥ��ä���˳�Ǽ����롢�Ȥ������Ȥ�ǰƬ�ˤ�\n"
 "���Ƥ����ޤ��礦���⤷�礭�ʼ̿���Ȥ��ȡ����ʤ��θ���Ʊ�ͤ��礭���ʤ�\n"
-"�ޤ�! ���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
+"�ޤ�! 240x288���餤�ˤ����ޤ��礭���β����ϡ��Ȥ��褤�Ǥ��礦��\n"
 
 #: g10/photoid.c:80
 msgid "Enter JPEG filename for photo ID: "
 msgstr "�ե���ID�Ѥ�JPEG�ե�����̾�����Ϥ��Ƥ�������: "
 
 #: g10/photoid.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "�ե����뤬�����ޤ���: %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 "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
+msgstr "�����˻Ȥ������Ǥ���? (y/N) "
 
 #: g10/photoid.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a JPEG file\n"
 msgstr "��%s�פϡ�JPEG�ե�����ǤϤ���ޤ���\n"
 
@@ -4734,7 +4678,7 @@ msgstr "�����ѥ����ޤ���"
 
 #: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
-msgstr "���Ϥ⤦�Ȥ��Ƥ��ޤ���"
+msgstr "���Ϥ⤦���ѤǤ�"
 
 #: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
@@ -4746,92 +4690,84 @@ msgstr "������ͳ: "
 
 #: g10/pkclist.c:90
 msgid "revocation comment: "
-msgstr "������Ŭ��: "
+msgstr "����������: "
 
 #: g10/pkclist.c:205
 msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
 #: g10/pkclist.c:213
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"�����٤����ꤵ��Ƥ��ޤ���:\n"
-"%4u%c/%08lX %s \""
+msgstr "�����٤����ꤵ��Ƥ��ޤ���:\n"
 
 #: g10/pkclist.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "       ��̾ \""
+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 "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\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 = ̤��\n"
+msgstr "  %d = �Τ�ʤ����ޤ��ϲ��Ȥ�����ʤ�\n"
 
 #: g10/pkclist.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = ���Ѥ� �ʤ�\n"
+msgstr "  %d = ���Ѥ� �ʤ�\n"
 
 #: g10/pkclist.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = ����Ū�˿��Ѥ���\n"
+msgstr "  %d = ����Ū�˿��Ѥ���\n"
 
 #: g10/pkclist.c:284
-#, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " m = �᡼�󡦥�˥塼�����\n"
+msgstr "  m = �᡼�󡦥�˥塼�����\n"
 
 #: g10/pkclist.c:287
-#, fuzzy
 msgid "  s = skip this key\n"
-msgstr " s = ���θ��ϤȤФ�\n"
+msgstr "  s = ���θ��ϤȤФ�\n"
 
 #: g10/pkclist.c:288
-#, fuzzy
 msgid "  q = quit\n"
-msgstr " q = ��λ\n"
+msgstr "  q = ��λ\n"
 
 #: g10/pkclist.c:292
 #, c-format
 msgid ""
 "The minimum trust level for this key is: %s\n"
 "\n"
-msgstr ""
+msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
 #: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
 #: g10/pkclist.c:319
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? "
+msgstr "�����ˤ��θ�������Ū�˿��Ѥ��ޤ���? (y/N) "
 
 #: g10/pkclist.c:333
 msgid "Certificates leading to an ultimately trusted key:\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: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\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: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ���������������ޤ���\n"
+msgstr "%s: ���θ����������ܿͤΤ�ΤǤ��롢�Ȥ�����������������������ޤ���\n"
 
 #: g10/pkclist.c:429
-#, fuzzy
 msgid "This key probably belongs to the named user\n"
 msgstr "���θ��Ϥ��֤��ܿͤΤ�ΤǤ�\n"
 
@@ -4840,47 +4776,42 @@ msgid "This key belongs to us\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 ""
-"���θ��ϡ����Υ桼����ID��ʤΤ��ܿͤΤ�Τ��ɤ����ο��Ǥ���\n"
-"���󡣺�����Ԥ����Ȥ� *�μ¤�* ���򤷤Ƥ��ʤ����ˤϡ�\n"
+"���θ��ϡ����Υ桼����ID��ʤΤ��ܿͤΤ�Τ��ɤ����ο��Ǥ�\n"
+"�ޤ��󡣺�����Ԥ����Ȥ�������ˡ����򤷤Ƥ��ʤ����ˤϡ�\n"
 "���μ���ˤ�no�������Ƥ���������\n"
-"\n"
 
 #: g10/pkclist.c:467
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? "
+msgstr "����Ǥ⤳�θ���Ȥ��ޤ���? (y/N) "
 
 #: g10/pkclist.c:501
 msgid "WARNING: Using untrusted key!\n"
-msgstr "�ٹ�: ���ѤǤ��ʤ������Ѥ��Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���ѤǤ��ʤ�����ȤäƤ��ޤ�!\n"
 
 #: g10/pkclist.c:508
-#, fuzzy
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "�ٹ�: ��%08lX�ϼ������줿�褦�Ǥ�: ������%08lX���Ժߡ�\n"
+msgstr "�ٹ�: ���θ��ϼ������줿�褦�Ǥ� (���������Ժ�)\n"
 
 #: g10/pkclist.c:517
-#, fuzzy
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���θ��ϻ�̾�����Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
 #: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���θ��Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+msgid "         This could mean that the signature is forged.\n"
 msgstr "      ��̾����ʪ�ʤ��Ȥ⤢�롢�Ȥ������ȤǤ���\n"
 
 #: g10/pkclist.c:527
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "�ٹ�: �����������ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
+msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 
 #: g10/pkclist.c:532
 msgid "Note: This key has been disabled.\n"
@@ -4888,7 +4819,7 @@ msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
 #: g10/pkclist.c:537
 msgid "Note: This key has expired!\n"
-msgstr "����: ���θ��ϴ����ڤ�Ǥ�!\n"
+msgstr "����: ���θ�����λ�Ǥ�!\n"
 
 #: g10/pkclist.c:548
 msgid "WARNING: This key is not certified with a trusted signature!\n"
@@ -4897,7 +4828,7 @@ msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 #: g10/pkclist.c:550
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
-msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
+msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
 #: g10/pkclist.c:558
 msgid "WARNING: We do NOT trust this key!\n"
@@ -4914,7 +4845,7 @@ msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
 #: g10/pkclist.c:569
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "      ���ν�̾���ܿͤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
+msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
 #: g10/pkclist.c:734 g10/pkclist.c:767 g10/pkclist.c:936 g10/pkclist.c:996
 #, c-format
@@ -4924,15 +4855,15 @@ msgstr "%s: �����å�: %s\n"
 #: g10/pkclist.c:744 g10/pkclist.c:968
 #, c-format
 msgid "%s: skipped: public key already present\n"
-msgstr "%s: �����å�: �������ϴ��ˤ���ޤ�\n"
+msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
 #: g10/pkclist.c:786
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�פ��Ѥ��ޤ��礦) ��\n"
+msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "������:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -4948,7 +4879,7 @@ msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
 #: g10/pkclist.c:849 g10/pkclist.c:911
 msgid "skipped: public key already set as default recipient\n"
-msgstr "�����å�: �������ϴ���μ���ͤȤ�������ѤߤǤ�\n"
+msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
 #: g10/pkclist.c:867
 msgid "Public key is disabled.\n"
@@ -4956,12 +4887,12 @@ msgstr "�������ϻ��ѶػߤǤ���\n"
 
 #: g10/pkclist.c:874
 msgid "skipped: public key already set\n"
-msgstr "�����å�: ������������ѤߤǤ�\n"
+msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
 #: g10/pkclist.c:903
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "����μ���͡�%s�פ����Ĥ���ޤ���\n"
+msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
 #: g10/pkclist.c:948
 #, c-format
@@ -4970,44 +4901,44 @@ msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
 #: g10/pkclist.c:1003
 msgid "no valid addressees\n"
-msgstr "ͭ���ʥ��ɥ쥹������ޤ���\n"
+msgstr "ͭ���ʰ��褬����ޤ���\n"
 
 #: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
-"��¸����ˤϡ�--output�ץ��ץ�������Ѥ��Ƥ�������\n"
+"��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "`%s'�κ������顼: %s\n"
+msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
-msgstr "ɸ�����Ϥ���ɹ����� ...\n"
+msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
+msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
 #: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "ƿ̾�μ�����ѤǤ�����̩��%08lX���Ѥ��ޤ� ...\n"
+msgstr "ƿ̾�μ�����ѤǤ�����̩��%s���ޤ� ...\n"
 
 #: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
@@ -5015,22 +4946,22 @@ msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
 #: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
-msgstr "DEK�ˤ��켰�ΰŹ�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+msgstr "�켰��DEK���ϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ������ԲĤǤ�\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 "����: �Ź楢�르�ꥺ��%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 "����: ��̩��%08lX��%s�Ǵ����ڤ�Ǥ�\n"
+msgstr "����: ��̩��%s��%s����λ�Ǥ�\n"
 
 #: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
@@ -5043,9 +4974,9 @@ msgid "build_packet failed: %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: �桼����ID������ޤ���\n"
+msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
 #: g10/revoke.c:272
 msgid "To be revoked by:\n"
@@ -5056,9 +4987,8 @@ msgid "(This is a sensitive revocation key)\n"
 msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
 #: g10/revoke.c:280
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
+msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
@@ -5074,14 +5004,14 @@ msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
 
 #: g10/revoke.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "��%s���Ѥμ������ϡ�����ޤ���\n"
+msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
 #: g10/revoke.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "��̩����%s�פ����Ĥ���ޤ���: %s\n"
+msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
 #: g10/revoke.c:461
 #, c-format
@@ -5093,9 +5023,8 @@ msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
 #: g10/revoke.c:479
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
+msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
 #: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
@@ -5117,10 +5046,10 @@ msgid ""
 msgstr ""
 "�����������������ޤ�����\n"
 "\n"
-"���Ĥ���ʤ��褦�����Τ˰�ư���Ƥ����������⤷��뤬���ξ�����ؤΥ�\n"
-"������������ȡ������Ĥ����ʤ��ξ������Ȥ��ʤ����뤳�Ȥ��Ǥ��ޤ���\n"
+"���Ĥ���ʤ��褦�����Τ˰�ư���Ƥ����������⤷��뤬���ξ�����ؤ�\n"
+"��������������ȡ������ĤϤ��ʤ��θ���Ȥ��ʤ����뤳�Ȥ��Ǥ��ޤ���\n"
 "���Τ��ɽФ���ǽ�ˤʤä����������ơ����ξ��������������ݴɤ����\n"
-"�������Ǥ��������������դ��Ƥ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
+"�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
 #: g10/revoke.c:592
@@ -5134,7 +5063,7 @@ msgstr "����󥻥�"
 #: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
-msgstr "(�����ǤϤ��ä�%d�����Ӥޤ�)\n"
+msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
 #: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
@@ -5150,9 +5079,8 @@ msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
 #: g10/revoke.c:680
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "��������Ǥ���? "
+msgstr "��������Ǥ���? (y/N) "
 
 #: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
@@ -5164,9 +5092,9 @@ msgid "protection algorithm %d%s is not supported\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
+msgstr "�ݸ�����%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
 #: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
@@ -5205,54 +5133,54 @@ 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 "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\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�ϡ���̾��%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�ϡ���̾��%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 "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\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 "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
+msgstr "��%s��%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פξ㳲�Ǥ��礦)\n"
 
 #: g10/sig-check.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "����: ��̾��%08lX�ϴ����ڤ�Ǥ�%s\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�ν�̾�������Ȥߤʤ��ޤ�\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: �������ѥ��åȤˤ�����������������ޤ���\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: ���б��ؤν�̾���б���������������ޤ���\n"
+msgstr "��%s: �����б��ؤν�̾�ˤ�����������������ޤ���\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
@@ -5276,87 +5204,79 @@ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 msgstr "�ݥꥷ��URL�ϡ�(PGP 2.x������) v3����̾�ˤ�����ޤ���\n"
 
 #: g10/sign.c:159
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
-msgstr "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\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 "�ٹ�: �ݥꥷ��url��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
+msgstr "�ٹ�: �����������С�URL��%%��ĥ��ǽ (�礭����)�����ĥ����ѡ�\n"
 
 #: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "�������줿��̾�θ����˼���: %s\n"
+msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 
 #: g10/sign.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%s��̾����̾��: \"%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 "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "��%s�פؤν�Ф�\n"
-
-#: g10/sign.c:807
-#, fuzzy, c-format
+#: g10/sign.c:808
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
+msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:158
-#, fuzzy, c-format
+#: g10/skclist.c:157
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "��%s�פ򥹥��å�: ��ʣ\n"
+msgstr "��%s�ɤ�ȤФ��ޤ�: ��ʣ\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
-#, fuzzy, c-format
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "��%s�פ򥹥��å�: %s\n"
+msgstr "��%s�ɤ�ȤФ��ޤ�: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
-msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
+msgstr "�����å�: ��̩���Ϥ⤦����ޤ�\n"
 
-#: g10/skclist.c:186
-#, fuzzy
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr ""
-"��%s�פ򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
-"��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\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 "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
+msgstr "���ѥ쥳����%lu, ��%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
 
 #: g10/tdbdump.c:104
 #, c-format
@@ -5364,42 +5284,39 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# Sitei sareta sin'you no atai itiran %s\n"
+"# Sitei sareta sin'youdo itiran %s\n"
 "# (\"gpg --import-ownertrust\" wo tukatte hukkyuu dekimasu)\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'���ɹ��ߥ��顼: %s\n"
+msgstr "��%s�פǥ��顼: %s\n"
 
 #: g10/tdbdump.c:159
-#, fuzzy
 msgid "line too long"
-msgstr "�Ԥ�Ĺ�᤮�ޤ�\n"
+msgstr "�Ԥ�Ĺ�����ޤ�"
 
 #: g10/tdbdump.c:167
 msgid "colon missing"
-msgstr ""
+msgstr "�����󤬤���ޤ���"
 
 #: g10/tdbdump.c:173
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "���顼: ̵���ʻ���\n"
+msgstr "̵���ʻ���"
 
 #: g10/tdbdump.c:178
-#, fuzzy
 msgid "ownertrust value missing"
-msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
+msgstr "��ͭ�Կ����٤�����ޤ���"
 
 #: g10/tdbdump.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "���ѥ쥳���ɤθ������顼: %s\n"
+msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
 #: g10/tdbdump.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "�ɹ��ߥ��顼: %s\n"
+msgstr "��%s�פ��ɽФ����顼: %s\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
@@ -5414,16 +5331,16 @@ 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 "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��� (n=%d): %s\n"
+msgstr "���ѥǡ����١��� �쥳����%lu: ����ߤ˼��Ԥ��ޤ��� (n=%d): %s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
 msgstr "���ѥǡ����١����Υȥ�󥶥�������礭�����ޤ�\n"
 
 #: g10/tdbio.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
+msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
 #: g10/tdbio.c:512
 #, c-format
@@ -5431,14 +5348,14 @@ msgid "%s: directory does not exist!\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 "��%s�פ��Ǥ��ޤ���: %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 "��%s�פ������ޤ���\n"
+msgstr "��%s�פ����å��Ǥ��ޤ���\n"
 
 #: g10/tdbio.c:550
 #, c-format
@@ -5457,7 +5374,7 @@ msgstr "%s: ���ѥǡ����١������Ǥ��ޤ���\n"
 
 #: g10/tdbio.c:597
 msgid "NOTE: trustdb not writable\n"
-msgstr "�ٹ�: ���ѥǡ����١��������������ǽ�Ǥ�\n"
+msgstr "����: ���ѥǡ����١��������������ǽ�Ǥ�\n"
 
 #: g10/tdbio.c:614
 #, c-format
@@ -5493,7 +5410,7 @@ msgstr "���ѥǡ����١���: �������˼��Ԥ��ޤ���: %s\n"
 #: g10/tdbio.c:1177
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "���ѥǡ����١���: �ɽФ��˼��� (n=%d): %s\n"
+msgstr "���ѥǡ����١���: �ɽФ��˼��Ԥ��ޤ��� (n=%d): %s\n"
 
 #: g10/tdbio.c:1198
 #, c-format
@@ -5533,14 +5450,14 @@ msgstr "%s: �쥳���ɤ��ɲä˼��Ԥ��ޤ���: %s\n"
 #: g10/tdbio.c:1499
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr ""
-"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�פ�¹Ԥ��Ƥ���������\n"
+"���ѥǡ����١���������Ƥ��ޤ�����gpg --fix-trustdb�ɤ�¹Ԥ��Ƥ���������\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϻ��ѤǤ��ޤ���\n"
+msgstr "%dʸ���ʾ��Ĺ���Υƥ����ȹԤϡ���갷���ޤ���\n"
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "���ϹԤ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
@@ -5551,29 +5468,29 @@ msgid "`%s' is not a valid long keyID\n"
 msgstr "��%s�פϡ�ͭ�����緿��ID�Ǥ���ޤ���\n"
 
 #: g10/trustdb.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "��%08lX: ���Ѥ��븰�Ȥ��Ƽ������ޤ���\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�����ѥǡ����١�����ʣ������ޤ�\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: ���Ѥ��븰�θ�����������ޤ��� - �����å�\n"
+msgstr "��%s: ���Ѥ���븰�θ�����������ޤ��� - �ȤФ��ޤ�\n"
 
 #: g10/trustdb.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "����Ū�˿��Ѥ������Ȥ��Ƶ�Ͽ���ޤ�����\n"
+msgstr "��%s������Ū�˿��Ѥ���褦��Ͽ���ޤ���\n"
 
 #: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "���ѥ쥳����%lu, �ꥯ�����ȡ�������%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
+msgstr "���ѥ쥳����%lu, �ꥯ�����ȷ�%d: �ɽФ��˼��Ԥ��ޤ���: %s\n"
 
 #: g10/trustdb.c:350
 #, c-format
@@ -5583,95 +5500,133 @@ 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 "%s���ѥ�ǥ�����\n"
+
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:501
-msgid "undefined"
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "����"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "��λ"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "̤�Τ�"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:513
 #, fuzzy
+msgid "[marginal]"
+msgstr "��������"
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+#, fuzzy
+msgid "[ultimate]"
+msgstr "����Ū"
+
+#: g10/trustdb.c:530
+msgid "undefined"
+msgstr "̤���"
+
+#: g10/trustdb.c:531
 msgid "never"
-msgstr "̵����    "
+msgstr "̵����"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
-msgstr ""
+msgstr "��������"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
-msgstr ""
+msgstr "����"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
-msgstr ""
+msgstr "����Ū"
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "���ѥǡ����١����μ���θ����ϡ�%s�Ǥ�\n"
+msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:560
-#, fuzzy, c-format
+#: g10/trustdb.c:589
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
+msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:575
-#, fuzzy, c-format
+#: g10/trustdb.c:604
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
+msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
-#, fuzzy, c-format
+#: g10/trustdb.c:822 g10/trustdb.c:1260
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "������%08lX�����Ĥ���ޤ���: %s\n"
+msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:1934
-#, fuzzy, c-format
+#: g10/trustdb.c:1963
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "����Ū�˿��Ѥ��븰%08lX�θ����������Ĥ���ޤ���\n"
+msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, 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:2118
-#, fuzzy, c-format
+#: g10/trustdb.c:2147
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "���ѥ쥳����%lu, ������%d: ����ߤ˼��Ԥ��ޤ���: %s\n"
+msgstr ""
+"���ѥǡ����١����ΥС�����󡦥쥳���ɤ������Ǥ��ޤ���: ����ߤ˼��Ԥ��ޤ�"
+"��: %s\n"
 
 #: g10/verify.c:116
 msgid ""
@@ -5694,7 +5649,7 @@ msgstr "����Ū�ʥ��顼"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "̤�ΤΥѥ��åȡ������פǤ�"
+msgstr "̤�ΤΥѥ��åȷ��Ǥ�"
 
 #: util/errors.c:56
 msgid "unknown version"
@@ -5758,7 +5713,7 @@ msgstr "��̩���������ޤ���"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "���ä���̩�����Ѥ����Ƥ��ޤ�"
+msgstr "���ä���̩�����Ȥ��Ƥ��ޤ�"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -5782,7 +5737,7 @@ msgstr "̤�Τΰ��̥��르�ꥺ��Ǥ�"
 
 #: util/errors.c:77
 msgid "file open error"
-msgstr "�ե����뤬�����ޤ���"
+msgstr "�ե�����Υ����ץ󡦥��顼"
 
 #: util/errors.c:78
 msgid "file create error"
@@ -5818,11 +5773,11 @@ msgstr "�꥽�������³��Ǥ�"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "���ؤ�̵���Ǥ�"
+msgstr "̵���ʸ��ؤǤ�"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "�����������Ǥ�"
+msgstr "�����ʾ�����Ǥ�"
 
 #: util/errors.c:88
 msgid "malformed user id"
@@ -5830,7 +5785,7 @@ msgstr "�桼����ID�ν񼰤�����������ޤ���"
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "�ե����뤬�Ĥ����ޤ���"
+msgstr "�ե�����Υ������������顼"
 
 #: util/errors.c:90
 msgid "file rename error"
@@ -5854,7 +5809,7 @@ msgstr "���ѤǤ��ʤ����������르�ꥺ��Ǥ�"
 
 #: util/errors.c:95
 msgid "file exists"
-msgstr "�ե����뤬����¸�ߤ��Ƥ��ޤ�"
+msgstr "�ե����뤬¸�ߤ��Ƥ��ޤ�"
 
 #: util/errors.c:96
 msgid "weak key"
@@ -5897,22 +5852,20 @@ msgid "keyserver error"
 msgstr "�������С��Υ��顼"
 
 #: util/errors.c:108
-#, fuzzy
 msgid "canceled"
 msgstr "����󥻥�"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "�Ź沽����Ƥ��ޤ���"
+msgstr "�����ɤ�����ޤ���"
 
 #: util/logger.c:157
 msgid "ERROR: "
-msgstr ""
+msgstr "���顼: "
 
 #: util/logger.c:160
 msgid "WARNING: "
-msgstr ""
+msgstr "�ٹ�: "
 
 #: util/logger.c:223
 #, c-format
@@ -5922,7 +5875,7 @@ msgstr "... �Х��Ǥ� (%s:%d:%s)\n"
 #: util/logger.c:229
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "�Х��򸫤Ĥ����褦�Ǥ� ... (%s:%d)\n"
+msgstr "�Х���ȯ�� ... (%s:%d)\n"
 
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
@@ -5946,20 +5899,19 @@ msgstr "qQ"
 
 #: util/miscutil.c:384
 msgid "okay|okay"
-msgstr ""
+msgstr "okay|okay"
 
 #: util/miscutil.c:386
 msgid "cancel|cancel"
-msgstr ""
+msgstr "cancel|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"
@@ -5971,479 +5923,63 @@ msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
 #: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤϼ¹ԤǤ��ޤ���\n"
+msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 
 #: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "�ե����뤬�����ޤ���: %s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "       ��̾ \""
-
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = ���ܤ��������ɽ������\n"
-
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "��%08lX: ���ϼ����ѤߤǤ�!\n"
+msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "��%08lX: �����ϼ����ѤߤǤ�!\n"
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "���󥢥르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
 
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "��%08lX: ���ϴ����ڤ�Ǥ�\n"
+#~ msgid "[%8.8s] "
+#~ msgstr "[%8.8s] "
 
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX: ���θ��Ͽ��ѤǤ��� ����\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (��̾�Τ�)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (��̾�ȰŹ沽)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s: �����ޤ���: %s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s: �ٹ�: ���Υե�����Ǥ�\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "%s�������ޤ���: %s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = �������ٿ��Ѥ���\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = �����˿��Ѥ���\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
 #~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
+#~ "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 ""
-#~ "\"\n"
-#~ "���ʤ��θ�%08lX��%s������Ū�˽�̾����Ƥ��ޤ�\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   %08lX��%s%s�˽�̾����Ƥ��ޤ�\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: ���������Ǥ��ޤ���: %s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s: ���å����Ǥ��ޤ���\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: ���å����Ǥ��ޤ���\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s: �����Ǥ��ޤ���: %s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: �ǥ��쥯�ȥ꡼���Ǥ��ޤ���: %s\n"
+#~ "������%s���Ф��������ޤ���\n"
+#~ "        ��û�θ�Ĺ��  768 �ӥå�\n"
+#~ "        ����θ�Ĺ�� 1024 �ӥå�\n"
+#~ "    ��Ĺ�ο侩��Ĺ�� 2048 �ӥå�\n"
 
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "���μ������줿����Ȥ������ʤ���С���no�פ������Ƥ���������"
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA�θ�Ĺ��512����1024�ޤǤǤ�\n"
 
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "�̿����%s�פ򳫤����Ȥ��Ǥ��ޤ���: %s\n"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "��Ĺ�����������ޤ���RSA�ϺǾ��Ǥ�1024�Ǥ���\n"
 
-#~ msgid "can't open file: %s\n"
-#~ msgstr "�ե����뤬�����ޤ���: %s\n"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "��Ĺ�����������ޤ����Ǿ��Ǥ�768�Ǥ���\n"
 
-#~ msgid "error: missing colon\n"
-#~ msgstr "���顼: ������ȴ���Ƥ��ޤ�\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "���顼: ��ͭ�Ԥ��Ѥ����ͤ�����ޤ���\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr " (�縰ID %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! �����ϼ����ѤߤǤ�: %s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- �Ǥä������μ�����ȯ��\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? ���������㳲: %s\n"
-
-#~ msgid "[revoked] "
-#~ msgstr "[����] "
-
-#~ msgid "[expired] "
-#~ msgstr "[��λ] "
-
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [ͭ������: %s]"
-
-#~ msgid " [expires: %s]"
-#~ msgstr " [ͭ������: %s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[����] "
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "%s������Ǥ��ޤ���: %s\n"
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "��Ĺ���礭�����ޤ���%d������Ǥ���\n"
 
 #~ msgid ""
-#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
-#~ msgstr ""
-#~ "�ٹ�: �����%s�פϡ�OpenPGP�ΰ����Ǥ���ޤ��󡣤����Ȥ���Ǥ�ǻȤ�������"
-#~ "��!\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[�ե����뷲]|�ե����뷲��Ź沽"
-
-#~ msgid "store only"
-#~ msgstr "��¸�Τ�"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[�ե����뷲]|�ե����뷲������"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "�����Ǥ��ʤ��褦���˽�̾"
-
-#~ msgid "sign a key locally and non-revocably"
-#~ msgstr "�����Ǥ��ʤ��褦��������Ū�˽�̾"
-
-#~ msgid "list only the sequence of packets"
-#~ msgstr "�ѥ��å���Τߤΰ���"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "�����Ƥ��Ƥʤ����ѥǡ����١����򹹿�"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "���줿���ѥǡ����١�������"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr ""
-#~ "�ե�����ޤ���ɸ�����Ϥ�\n"
-#~ "��������"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
-
-#~ msgid "|NAME|use NAME as default recipient"
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
 #~ msgstr ""
-#~ "|̾��|����μ���ͤȤ���\n"
-#~ "��̾���פ����"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "����μ���ͤ˴���θ������"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "ü�����Ի���"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "����Ū��v3��̾"
-
-#~ msgid "do not force v3 signatures"
-#~ msgstr "v3��̾�������ʤ�"
-
-#~ msgid "force v4 key signatures"
-#~ msgstr "����Ū��v4��̾"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "v4��̾�������ʤ�"
-
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "�Ź沽�ˤϾ��MDC�����"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr "�Ź沽�ˤ����Ф�MDC����Ѥ��ʤ�"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "gpg����������Ȥ����"
-
-#~ msgid "batch mode: never ask"
-#~ msgstr "�Хå����⡼��: ��ǧ��ά"
-
-#~ msgid "assume yes on most questions"
-#~ msgstr ""
-#~ "�����Ƥ��μ����������yes\n"
-#~ "�Ȥߤʤ�"
-
-#~ msgid "assume no on most questions"
-#~ msgstr ""
-#~ "�����Ƥ��μ����������no\n"
-#~ "�Ȥߤʤ�"
-
-#~ msgid "add this keyring to the list of keyrings"
-#~ msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
+#~ "2048����礭�ʸ�Ĺ�ϡ��׻����֤� ���� Ĺ���ʤ�Τ�\n"
+#~ "�侩���ޤ���!\n"
 
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "�����ˤ�����̩���ؤ��ɲ�"
-
-#~ msgid "show which keyring a listed key is on"
-#~ msgstr "�����θ������븰�ؤ�ɽ��"
-
-#~ msgid "|NAME|use NAME as default secret key"
-#~ msgstr ""
-#~ "|̾��|�������̩���Ȥ���\n"
-#~ "��̾���פ����"
-
-#~ msgid "|HOST|use this keyserver to lookup keys"
-#~ msgstr "|�ۥ���|���θ����ˤ��θ������С������"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr ""
-#~ "|CHARSET̾|ü����charset���CHARSET̾��\n"
-#~ "������"
-
-#~ msgid "read options from file"
-#~ msgstr ""
-#~ "�ե����뤫�饪�ץ�����\n"
-#~ "�ɤ߹���"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr ""
-#~ "|�ե�����|���ơ����������ե������\n"
-#~ "�񤭽Ф�"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|��ID|���θ�������Ū�˿��Ѥ���"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr ""
-#~ "|�ե�����|��ĥ�⥸�塼��Υե������\n"
-#~ "�ɤ߹���"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr ""
-#~ "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
-#~ "����"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr ""
-#~ "�ѥ��åȤȰŹ������Υ��ץ���\n"
-#~ "�������OpenPGP��������"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr ""
-#~ "�ѥ��åȤȰŹ������Υ��ץ���\n"
-#~ "�������PGP 2.x��������"
-
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|�ѥ��ե졼�����⡼��N�����"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr ""
-#~ "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
-#~ "���������󥢥르�ꥺ������"
-
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr ""
-#~ "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
-#~ "���르�ꥺ������"
-
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr ""
-#~ "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
-#~ "����"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr ""
-#~ "|̾��|��̾���פΥ�å���������\n"
-#~ "���르�ꥺ������"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr ""
-#~ "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
-#~ "����"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr ""
-#~ "�Ź�ѥ��åȤθ�ID�ե������\n"
-#~ "������"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "�ե���ID��ɽ��"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "�ե���ID��ɽ�����ʤ�"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr ""
-#~ "�ե���ID��������륳�ޥ�ɹ�\n"
-#~ "������"
-
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
-#~ msgstr "���̥��르�ꥺ���%s�פϡ������Ǥ����ɽФ������Ǥ�\n"
-
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr "���̥��르�ꥺ���%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: ���θ��ϼºݤ��ܿͤΤ�Τ��������Ǥ�����\n"
-#~ "���������������ޤ�\n"
-
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "����%c%lu��ͭ���ǤϤ���ޤ���\n"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "�� %08lX: rfc2440�θ��ǤϤ���ޤ��� - �����å�\n"
-
-#~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
-#~ msgstr "����: ElGamal�μ縰�򸡽� - �����ˤ����ɹ��ߤ˻��֤�������ޤ�\n"
-
-#~ msgid " (default)"
-#~ msgstr " (����)"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX  ����: %s ����: %s"
-
-#~ msgid "Notation: "
-#~ msgstr "����: "
-
-#~ msgid "Policy: "
-#~ msgstr "�ݥꥷ��: "
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "�������С����鸰���ɤ߹���ޤ���: %s\n"
-
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "`%s'�ؤ��������顼: %s\n"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "`%s'�ؤ����������� (����=%u)\n"
-
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "`%s'�ؤ������˼��Ԥ��ޤ���: ����=%u\n"
-
-#~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "���θ������С��ϡ�--search-keys�򥵥ݡ��Ȥ��ޤ���\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "�������С��򸡺��Ǥ��ޤ���: %s\n"
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "���θ�Ĺ�������ˤ褤�Ǥ���? (y/N) "
 
 #~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
 #~ msgstr ""
-#~ "��%08lX: ����ϡ�PGP����������ElGamal�Ǥ���\n"
-#~ "��̾���Ѥ���ˤϡ����θ��ϰ����Ǥ� �ʤ� �Ǥ�!\n"
+#~ "�狼��ޤ����������������ʤ��Υ�˥����䥭���ܡ����ռͤϡ�\n"
+#~ "����ˤ��������ȼ�Ǥ��뤳�Ȥ�ǰƬ�ˤ����Ƥ�������!\n"
 
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr "��%08lX�ϡ�%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "�¸���Υ��르�ꥺ��ϻ��Ѥ��٤��ǤϤ���ޤ���!\n"
 
 #~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr "��%08lX�ϡ�%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
-
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "����Ū�˿��Ѥ������Ȥ��Ƹ� %08lX ��Ͽ���ޤ���\n"
-
-#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-#~ msgstr "ElGamal��̾�� %08lX ���� %08lX �ޤǤν�̾�򥹥��å�\n"
-
-#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-#~ msgstr "%08lX ����ElGamal��̾�� %08lX �ޤǤν�̾�򥹥��å�\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr "����%d�Ǹ�������̾�Ѥ�=%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"
-#~ "\n"
-#~ "DSA (��̾DSS) �ϡ���̾�ˤΤ��Ѥ��뤳�Ȥ��Ǥ����Żҽ�̾���르��\n"
-#~ "����Ǥ���DSA��̾��ElGamalˡ�����®�˸��ڤǤ���Τǡ������\n"
-#~ "�侩���륢�르�ꥺ��Ǥ���\n"
-#~ "\n"
-#~ "ElGamal�ϡ���̾�ȰŹ沽���Ѥ��뤳�Ȥ��Ǥ��륢�르�ꥺ��Ǥ���\n"
-#~ "OpenPGP�Ǥϡ����Υ��르�ꥺ��ΡְŹ沽�Τߡפȡֽ�̾+�Ź沽��\n"
-#~ "��2�Ĥ���ˡ����̤��Ƥ��ޤ������ºݤˤ�Ʊ���Ǥ�������������̾��\n"
-#~ "�ΰ����ʸ�����ˤϰ������ѿ������̤���ˡ�����򤷤ʤ���Фʤ�\n"
-#~ "�ޤ��󡣤��Υץ������ǤϤ��줬��ǽ�Ǥ�����¾��OpenPGP�μ�����\n"
-#~ "�ϡ��ֽ�̾+�Ź沽�פ���ˡ���ᤷ�ʤ����⤷��ޤ���\n"
-#~ "\n"
-#~ "�ǽ�θ�(�縰)�ϡ���̾�˻��ѤǤ��븰�Ǥʤ���Фʤ�ޤ��󡣤��줬\n"
-#~ "���Υ�˥塼�ˡְŹ沽�Τߡפ�ElGamal���Τʤ���ͳ�Ǥ���"
-
-#~ 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."
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
 #~ msgstr ""
-#~ "�����θ���RFC2440���������Ƥ��ޤ������侩���ޤ���\n"
-#~ "�ʤ��ʤ顢�����򥵥ݡ��Ȥ��Ƥ��ʤ��ץ�����ब���ꡢ\n"
-#~ "����������̾������Ĺ���ơ����ڤˤ���֤������뤿��Ǥ���"
-
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "����ޤǤ�%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
-
-#~ msgid "key incomplete\n"
-#~ msgstr "�Դ����ʸ�\n"
-
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "��%08lX: �Դ���\n"
+#~ "���ΰŹ楢�르�ꥺ��ϡ�����뤵��Ƥ��ޤ���\n"
+#~ "��ä�ɸ��Ū�ʥ��르�ꥺ���ȤäƤ�������!\n"
diff --git a/po/nl.po b/po/nl.po
index f0c5fd68d..6e0be3e76 100644
--- a/po/nl.po
+++ b/po/nl.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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-11-03 17:37+0100\n"
 "PO-Revision-Date: 2004-05-10 19:23+0200\n"
 "Last-Translator: Elros Cyriatan <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -38,8 +38,8 @@ msgstr "geen entropie verzamelende module gevonden\n"
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
 #: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/plaintext.c:468 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"
@@ -75,7 +75,7 @@ msgstr "let op: random_seed bestand niet bijgewerkt\n"
 
 #: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
 #: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: g10/sign.c:779 g10/sign.c:1037 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan `%s' niet aanmaken: %s\n"
@@ -694,7 +694,7 @@ msgstr "kan `%s' niet openen\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--uitvoer werkt niet voor deze opdracht\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2927 g10/keyserver.c:1414
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
@@ -744,7 +744,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "gebruik de optie \"--delete-secret-keys\" om deze eerst te verwijderen.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout bij maken wachtwoord: %s\n"
@@ -793,7 +793,7 @@ msgstr ""
 "het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
 "de ontvanger in\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -1298,7 +1298,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s is geen geldige tekenset\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
+#: g10/g10.c:2279 g10/keyedit.c:3443
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kon sleutelserver URI niet inlezen\n"
@@ -2209,7 +2209,7 @@ msgstr "sleutel %08lX: nieuwe sleutel - overgeslagen\n"
 msgid "no writable keyring found: %s\n"
 msgstr "geen schrijfbare sleutelbos gevonden: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:766 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "bezig met schrijven naar `%s'\n"
@@ -2752,7 +2752,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Echt ondertekenen? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3891 g10/keyedit.c:3982 g10/keyedit.c:4055
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3262,83 +3262,84 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key %s"
 msgstr "Deze sleutel is mogelijk herroepen door sleutel %s "
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (gevoelig)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2444 g10/keyedit.c:2459
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[herroepen] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verloopt: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2446 g10/keyedit.c:2461
 #: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verloopt: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " vertrouwen: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " vertrouwen: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Deze sleutel is uit gezet"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
+#: g10/keyedit.c:2365 g10/keyedit.c:2367 g10/keyedit.c:2369
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
+#: g10/keyedit.c:2365 g10/keyedit.c:2478 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[herroepen] "
 
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
+#: g10/keyedit.c:2367 g10/keyedit.c:2480 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2406
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Er zijn geen voorkeuren op een PGP 2.x stijl gebruikerscode.\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2414
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3347,13 +3348,13 @@ msgstr ""
 "juist\n"
 "is tenzij u het programma opnieuw start.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2545
 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:2599
+#: g10/keyedit.c:2605
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3363,45 +3364,45 @@ msgstr ""
 "kan\n"
 "         zorgen dat sommige versies van PGP deze sleutel verwerpen.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2610 g10/keyedit.c:2888
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Weet u zeker dat u deze toch wilt toevoegen? (j/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2616
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "U kunt geen foto ID toevoegen aan een PGP2 stijl sleutel.\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2756
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deze goede ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2766
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deze ongeldige ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2770
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deze onbekende ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2776
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Echt deze zelfondertekening verwijderen? (j/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2790
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2791
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2794
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2883
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3411,166 +3412,166 @@ msgstr ""
 "         toevoegen kan zorgen dat sommige versies van PGP deze sleutel "
 "verwerpen.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2894
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "U kunt geen aangestelde herroeper toevoegen aan een PGP 2.x stijl sleutel.\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2914
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geef de gebruikerscode van de aangestelde herroeper: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2937
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2952
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2974
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2993
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
 "kan niet ongedaan gemaakt worden!\n"
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2999
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Wilt u echt deze sleutel aanwijzen als een aangestelde herroeper? (j/N): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3060
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Verwijder alstublieft selecties van de geheime sleutels.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3066
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer alstublieft ten hoogste één secundaire sleutel.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3070
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "De verlooptijd voor een secundaire sleutel wordt gewijzigd.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3073
 msgid "Changing expiration time for the primary key.\n"
 msgstr "De verlooptijd voor de primaire sleutel wordt gewijzigd.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3119
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de verlooptijd van een v3-sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3135
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen geassocieerde ondertekening in geheime sleutelbos\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3215
 msgid "Please select exactly one user ID.\n"
 msgstr "Selecteer alstublieft precies één gebruikerscode.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3254 g10/keyedit.c:3364 g10/keyedit.c:3483
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "v3-zelfondertekening op gebruikerscode \"%s\" wordt overgeslagen\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3425
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3504
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3505
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3567
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikerscode met index %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3613
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3730
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "gebruikerscode: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3733 g10/keyedit.c:3797 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ondertekend door %08lX op %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3735 g10/keyedit.c:3799 g10/keyedit.c:3842
 msgid " (non-exportable)"
 msgstr " (niet-uitvoerbaar)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3739
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze ondertekening is verlopen op %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3743
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3747
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3774
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "U heeft deze gebruikerscodes ondertekend:\n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3800
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (niet-uitvoerbaar)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3807
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   herroepen door %08lX op %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3829
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt deze ondertekeningen te herroepen:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3849
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Echt de herroepingscertificaten maken? (j/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3879
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3949
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "gebruikerscode \"%s\" is al herroepen\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3966
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WAARSCHUWING: een gebruikerscode ondertekening is van %d seconden in de "
 "toekomst\n"
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4135
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4744,12 +4745,12 @@ msgstr "geannuleerd door gebruiker\n"
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem met agent: agent geeft 0x%lx terug\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1053 g10/passphrase.c:1212
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "kan niet vragen om wachtwoord in batch-modus\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1058 g10/passphrase.c:1217
 msgid "Enter passphrase: "
 msgstr "Geef wachtwoord: "
 
@@ -4773,7 +4774,7 @@ msgstr "%u-bit %s sleutel, ID %08lX, gemaakt op %s"
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1221
 msgid "Repeat passphrase: "
 msgstr "Herhaal wachtwoord: "
 
@@ -4983,7 +4984,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Dit kan betekenen dat de ondertekening een vervalsing is.\n"
 
 #: g10/pkclist.c:527
@@ -5442,54 +5444,49 @@ msgstr ""
 "u kunt alleen losgekoppeld ondertekenen met PGP 2.x stijl sleutels in in --"
 "pgp2 modus\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "bezig met schrijven naar `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "afdwingen van digest-algoritme %s (%d) overtreedt voorkeuren ontvanger\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "bezig met ondertekenen:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "u kunt alleen niet-gecodeerde ondertekeningen maken met PGP 2.x stijl "
 "sleutels in --pgp2 modus\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s codering zal worden gebruikt\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "sleutel is niet gemarkeerd als onveilig - kan deze niet gebruiken met de nep "
 "RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' overgeslagen: dubbel\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "overgeslagen: geheime sleutel reeds aanwezig\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -6121,6 +6118,10 @@ msgstr "bewerking is niet mogelijk zonder geïnitialiseerd veilig geheugen\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n"
 
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "bezig met schrijven naar `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "sorry, dat kan niet in batch-modus\n"
 
diff --git a/po/pl.po b/po/pl.po
index 9cc489320..b864acd03 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -24,11 +24,6 @@ msgstr ""
 "sig-check.c g10/sign.c g10/trustdb.c g10/verify.c g10/status.c g10/pubkey-"
 "enc.c\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "w tej wersji algorytm skr�tu ,,%s'' jest tylko do odczytu\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -43,11 +38,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -81,9 +77,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "nie mo�na utworzy� ,,%s'': %s\n"
@@ -143,90 +139,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: b��d odczytu pustego wpisu: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr ",,%s'' ju� jest skompresowany\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "generacja nowej pary kluczy"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "usuni�cie bloku klucza nie powiod�o si�: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -314,15 +370,15 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
@@ -330,143 +386,152 @@ msgstr "Tw�j wyb�r? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "w�kl"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "w�kl"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "nie podano przyczyny"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "nie zosta� przetworzony"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizacja ustawie� klucza"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "niew�a�ciwy znak w tek�cie ustawie�\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Odcisk klucza:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "b��d: niew�a�ciwy odcisk klucza\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -474,233 +539,257 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "wyj�cie"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "w"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "pomoc"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "lista"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Klucz dost�pny w: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "w�kl"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lpodpis"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "odc"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "unpod"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "b��d og�lny"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Podaj identyfikator u�ytkownika (user ID): "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Podaj identyfikator u�ytkownika (user ID): "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Powt�rz has�o: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -710,13 +799,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -759,7 +848,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -779,7 +868,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -806,7 +895,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -908,27 +997,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
@@ -1107,15 +1196,15 @@ msgstr "pozostawienie bez zmian"
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1123,7 +1212,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1144,15 +1233,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1162,7 +1251,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1170,73 +1259,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, 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:1182
+#: g10/g10.c:1217
 #, 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:1185
+#: g10/g10.c:1220
 #, 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:1191
+#: g10/g10.c:1226
 #, 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:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, 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:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1244,21 +1333,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1266,381 +1355,381 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1648,23 +1737,23 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1673,28 +1762,28 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -2048,382 +2137,382 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, 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:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, 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:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
@@ -2661,7 +2750,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
 #: g10/keyedit.c:918
@@ -2733,7 +2823,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2764,7 +2854,7 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
@@ -3245,83 +3335,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[uniewa�niony]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "data"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3329,7 +3403,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[uniewa�niony]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "data"
+
+#: g10/keyedit.c:2536
 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"
@@ -3338,7 +3424,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3347,45 +3433,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3395,162 +3481,162 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, 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:3499
+#: g10/keyedit.c:3496
 #, 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:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3592,12 +3678,12 @@ msgstr "zapis podpisu klucza nim samym\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmair klucza zaokr�glony do %u bit�w\n"
@@ -3665,91 +3751,60 @@ msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (tylko do szyfrowania)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) Klucz dla algorytmu ElGamala (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Nast�pi generacja nowej pary kluczy dla algorytmu(�w) %s.\n"
-"               minimalny rozmiar klucza wynosi 768 bit�w\n"
-"               domy�lny rozmiar klucza wynosi 1024 bity\n"
-"  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"D�ugo�� klucza zbyt ma�a; minimalna dopuszczalna dla RSA wynosi 1024 bity.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "zbyt du�y rozmiar klucza, ograniczenie wynosi %d.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� potrzebne\n"
-"obliczenia trwaj� wtedy BARDZO d�ugo!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
-"komputera przez pods�uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bit�w.\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3765,7 +3820,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:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3781,29 +3836,29 @@ 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:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Okres wa�no�ci podpisu? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nie ma daty wa�no�ci\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s traci wa�no��: %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3811,12 +3866,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3833,44 +3888,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 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:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3881,43 +3936,43 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 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:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3929,7 +3984,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3945,54 +4000,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -4000,12 +4051,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4013,7 +4064,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4021,41 +4072,41 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, 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:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4101,28 +4152,28 @@ msgstr "Zbi�r kluczy"
 msgid "expired: %s)"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4475,7 +4526,7 @@ msgstr "binarny"
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "nieznany"
 
@@ -4507,29 +4558,40 @@ 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:101
+#: g10/misc.c:105
 #, 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:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, 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:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
+#: g10/misc.c:299
+#, 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:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"u�ywanie tego szyfru jest odradzane; nale�y u�ywa� standardowych szyfr�w!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algorytm szyfruj�cy nie jest zaimplementowany"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "podpis %s, skr�t %s\n"
+
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4638,50 +4700,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "nie mo�na ustawi� numeru procesu klienckiego agenta\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "serwer nie chce czyta� deskryptora dla agenta\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "serwer nie chce pisa� deskryptora dla agenta\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z porozumiewaniem si� z agentem\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4692,41 +4754,41 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "has�o zbyt d�ugie\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "b��dna odpowied� agenta\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4736,17 +4798,17 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
@@ -4951,7 +5013,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "             To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
 #: g10/pkclist.c:527
@@ -5057,28 +5120,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
@@ -5411,51 +5474,46 @@ msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "zapis do '%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5644,12 +5702,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linia d�u�sza ni� %d znak�w\n"
@@ -5700,85 +5758,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[uniewa�niony]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[przeterminowany]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "nieznany"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
@@ -6087,6 +6180,66 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "w tej wersji algorytm skr�tu ,,%s'' jest tylko do odczytu\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 ""
+#~ "Nast�pi generacja nowej pary kluczy dla algorytmu(�w) %s.\n"
+#~ "               minimalny rozmiar klucza wynosi 768 bit�w\n"
+#~ "               domy�lny rozmiar klucza wynosi 1024 bity\n"
+#~ "  najwi�kszy sugerowany rozmiar klucza wynosi 2048 bit�w\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "D�ugo�� klucza zbyt ma�a; minimalna dopuszczalna dla RSA wynosi 1024 "
+#~ "bity.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "zbyt du�y rozmiar klucza, ograniczenie wynosi %d.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Klucze d�u�sze ni� 2048 bit�w s� odradzane, poniewa� potrzebne\n"
+#~ "obliczenia trwaj� wtedy BARDZO d�ugo!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
+#~ "komputera przez pods�uch emisji elektromagnetycznej klawiatury i "
+#~ "monitora!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Nie nale�y u�ywa� algorytm�w do�wiadczalnych!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "u�ywanie tego szyfru jest odradzane; nale�y u�ywa� standardowych "
+#~ "szyfr�w!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "zapis do '%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
 
@@ -6219,12 +6372,6 @@ msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "un? problem przy sprawdzaniu uniewa�nienia: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[uniewa�niony]"
-
-#~ msgid "[expired] "
-#~ msgstr "[przeterminowany]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [wygasa :%s]"
diff --git a/po/pt.po b/po/pt.po
index ef4e2fe28..793809c8e 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -17,11 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -36,11 +31,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -74,9 +70,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "imposs�vel criar `%s': %s\n"
@@ -127,90 +123,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro ao ler registo livre: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "%s' j� comprimido\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "remo��o do bloco de chave falhou: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -298,15 +354,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Op��o? "
 
@@ -314,141 +370,150 @@ msgstr "Op��o? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, 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:658
+#: g10/card-util.c:746
 #, 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:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -456,232 +521,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "sair"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "erro geral"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repita a frase secreta: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -691,13 +778,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -740,7 +827,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -759,7 +846,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -787,7 +874,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -890,27 +977,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1093,15 +1180,15 @@ msgstr "n�o fazer altera��es"
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1109,7 +1196,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1129,15 +1216,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1147,7 +1234,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1155,465 +1242,465 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, 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:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 #, 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:2713
+#: g10/g10.c:2746
 #, 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, 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:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizador"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizador"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1621,23 +1708,23 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 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:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1646,27 +1733,27 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %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:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2027,381 +2114,381 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@ -2639,7 +2726,7 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
 #: g10/keyedit.c:918
@@ -2712,7 +2799,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2743,7 +2830,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
@@ -3223,83 +3310,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "revkey"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3307,13 +3378,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "revkey"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3322,46 +3405,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3370,161 +3453,161 @@ 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:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 #, 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, 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:3499
+#: g10/keyedit.c:3496
 #, 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:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3567,12 +3650,12 @@ msgstr "a escrever a auto-assinatura\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
@@ -3640,90 +3723,60 @@ msgstr "   (%d) DSA (apenas assinatura)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (apenas cifragem)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Prestes a gerar um novo par de chaves %s.\n"
-"              tamanho m�nimo �  768 bits\n"
-"         tamanho por omiss�o � 1024 bits\n"
-"     tamanho m�ximo sugerido � 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Qual o tamanho de chave desejado? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
-"porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Tudo bem, mas n�o se esque�a que a radia��o do seu monitor e teclado tamb�m "
-"� extremamente vulner�vel a ataques!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3739,7 +3792,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3755,29 +3808,29 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3785,12 +3838,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3808,44 +3861,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 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:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3856,29 +3909,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3886,12 +3939,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3903,7 +3956,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3915,54 +3968,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "O par de chaves DSA ter� 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, 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:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3970,12 +4019,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3983,7 +4032,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3991,40 +4040,40 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4070,28 +4119,28 @@ msgstr "Porta-chaves"
 msgid "expired: %s)"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4446,7 +4495,7 @@ msgstr "primary"
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
@@ -4479,30 +4528,42 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desactivar core dumps: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Algoritmos experimentais n�o devem ser usados!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritmo de criptografia n�o implementado"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"este algoritmo de criptografia est� desctualizado; por favor use um "
-"algoritmo mais standard!x\n"
+"for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
+"destinat�rio\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4610,50 +4671,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "n�o consegui colocar o pid do cliente no agente\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "n�o consigo obter FD de leitura no servidor para o agente\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "n�o consigo obter FD de escrita no servidor para o agente\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4666,41 +4727,41 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4710,17 +4771,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -4926,7 +4987,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
 #: g10/pkclist.c:527
@@ -5029,28 +5091,28 @@ msgstr "nenhum endere�o v�lido\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -5372,12 +5434,7 @@ msgstr "assinatura %s de: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "a escrever para `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5385,39 +5442,39 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5605,12 +5662,12 @@ msgstr ""
 "A base de dados de confian�a est� danificada; por favor execute\n"
 "\"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -5662,87 +5719,122 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "revkey"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "expire"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "vers�o desconhecida"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6052,6 +6144,60 @@ 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 ""
+#~ "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 ""
+#~ "Prestes a gerar um novo par de chaves %s.\n"
+#~ "              tamanho m�nimo �  768 bits\n"
+#~ "         tamanho por omiss�o � 1024 bits\n"
+#~ "     tamanho m�ximo sugerido � 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "tamanho muito pequeno; 1024 � o valor m�nimo permitido para RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
+#~ "porque o tempo de computa��o � REALMENTE longo!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Tudo bem, mas n�o se esque�a que a radia��o do seu monitor e teclado "
+#~ "tamb�m � extremamente vulner�vel a ataques!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Algoritmos experimentais n�o devem ser usados!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "este algoritmo de criptografia est� desctualizado; por favor use um "
+#~ "algoritmo mais standard!x\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "a escrever para `%s'\n"
+
 #, fuzzy
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@ -6182,14 +6328,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr "rev? problema ao verificar revoga��o: %s\n"
 
 #, fuzzy
-#~ msgid "[revoked] "
-#~ msgstr "revkey"
-
-#, fuzzy
-#~ msgid "[expired] "
-#~ msgstr "expire"
-
-#, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "[expira: %s]"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e13516561..1e8d8d128 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,11 +21,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr ""
-
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -40,11 +35,12 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -78,9 +74,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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"
 msgstr "imposs�vel criar %s: %s\n"
@@ -132,90 +128,150 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: erro lendo registro livre: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "%lu chaves processadas\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "gerar um novo par de chaves"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "enumera��o de blocos de chaves falhou: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -303,15 +359,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
@@ -319,142 +375,151 @@ msgstr "Sua op��o? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -462,235 +527,259 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
 # INICIO MENU
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "sair"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "erro geral"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "Digite o identificador de usu�rio: "
+
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "Digite o identificador de usu�rio: "
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repita a frase secreta: "
+
+#: g10/cardglue.c:718
+#, 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:3577 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,13 +789,13 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -750,7 +839,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -769,7 +858,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -794,7 +883,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -895,27 +984,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1104,21 +1193,21 @@ msgstr "n�o fazer altera��es"
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1138,15 +1227,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1156,7 +1245,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1164,473 +1253,473 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 #, 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:2713
+#: g10/g10.c:2746
 #, 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, 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:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 #, fuzzy
 msgid "--nrsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 #, fuzzy
 msgid "--nrlsign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, 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:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1639,26 +1728,26 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 #, 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1667,27 +1756,27 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %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:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -1993,376 +2082,376 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, 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:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, 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:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, 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:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
@@ -2597,7 +2686,7 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
 #: g10/keyedit.c:918
@@ -2659,7 +2748,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2691,7 +2780,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -3187,305 +3276,300 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, fuzzy, c-format
-msgid "This key may be revoked by %s key "
+msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
+#: g10/keyedit.c:2397
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
+#: g10/keyedit.c:2405
+msgid ""
+"Please note that the shown key validity is not necessarily correct\n"
+"unless you restart the program.\n"
+msgstr ""
+
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2400
-msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr ""
-
-#: g10/keyedit.c:2408
-msgid ""
-"Please note that the shown key validity is not necessarily correct\n"
-"unless you restart the program.\n"
-msgstr ""
-
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2536
 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:2599
+#: g10/keyedit.c:2596
 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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 #, 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:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 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:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, 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:3499
+#: g10/keyedit.c:3496
 #, 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:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 #, 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:3741
+#: g10/keyedit.c:3738
 #, 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:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3532,12 +3616,12 @@ msgstr "escrevendo auto-assinatura\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
@@ -3605,91 +3689,60 @@ msgstr "   (%d) DSA (apenas assinatura)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Prestes a gerar novo par de chaves %s.\n"
-"              tamanho m�nimo �  768 bits\n"
-"              tamanho padr�o � 1024 bits\n"
-"     tamanho m�ximo sugerido � 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Que tamanho de chave voc� quer? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
-
-#: g10/keygen.c:1425
-#, fuzzy
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
-"porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Que tamanho de chave voc� quer? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Tudo bem, mas tenha em mente que a radia��o de seu monitor e teclado tamb�m "
-"� vulner�vel a ataques!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3705,7 +3758,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -3722,30 +3775,30 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 #, fuzzy
 msgid "Signature is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, fuzzy, c-format
 msgid "%s does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, fuzzy, c-format
 msgid "%s expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3753,12 +3806,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3775,44 +3828,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 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:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3823,28 +3876,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 #, 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3852,12 +3905,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3869,7 +3922,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3881,54 +3934,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "O par de chaves DSA ter� 1024 bits.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3936,12 +3985,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3949,7 +3998,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3957,40 +4006,40 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4040,32 +4089,32 @@ msgstr ""
 msgid "expired: %s)"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4421,7 +4470,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
@@ -4454,31 +4503,40 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "imposs�vel desativar core dumps: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, 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:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Algoritmos experimentais n�o devem ser usados!\n"
+#: g10/misc.c:299
+#, 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:324
-#, fuzzy
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"este algoritmo de criptografia � depreciado; por favor use algum\n"
-"algoritmo padr�o!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritmo de criptografia n�o implementado"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "assinatura %s de: %s\n"
+
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4586,50 +4644,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr ""
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4641,44 +4699,44 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 #, fuzzy
 msgid "passphrase too long\n"
 msgstr "linha muito longa\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr ""
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4688,17 +4746,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -4904,7 +4962,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "       Isto pode significar que a assinatura � falsificada.\n"
 
 #: g10/pkclist.c:527
@@ -5010,29 +5069,29 @@ msgstr "nenhum endere�o v�lido\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -5343,52 +5402,47 @@ msgstr "assinatura %s de: %s\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "escrevendo para `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5578,12 +5632,12 @@ msgstr ""
 "O banco de dados de confiabilidade est� danificado; por favor rode\n"
 "\"gpg --fix-trust-db\".\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linha de entrada maior que %d caracteres\n"
@@ -5634,87 +5688,122 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "revkey"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "expire"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "vers�o desconhecida"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6028,6 +6117,62 @@ 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 ""
+#~ "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 ""
+#~ "Prestes a gerar novo par de chaves %s.\n"
+#~ "              tamanho m�nimo �  768 bits\n"
+#~ "              tamanho padr�o � 1024 bits\n"
+#~ "     tamanho m�ximo sugerido � 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
+
+#, fuzzy
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "tamanho muito grande; %d � o valor m�ximo permitido.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
+#~ "porque o tempo de computa��o � REALMENTE longo!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Voc� tem certeza de que quer este tamanho de chave? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Tudo bem, mas tenha em mente que a radia��o de seu monitor e teclado "
+#~ "tamb�m � vulner�vel a ataques!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Algoritmos experimentais n�o devem ser usados!\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "este algoritmo de criptografia � depreciado; por favor use algum\n"
+#~ "algoritmo padr�o!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "escrevendo para `%s'\n"
+
 #, fuzzy
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
@@ -6157,14 +6302,6 @@ msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 #~ msgstr "rev- revoga��es de chaves incorreta\n"
 
 #, fuzzy
-#~ msgid "[revoked] "
-#~ msgstr "revkey"
-
-#, fuzzy
-#~ msgid "[expired] "
-#~ msgstr "expire"
-
-#, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "A chave expira em %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index a3f98ccc1..4e43994cc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+0100\n"
 "PO-Revision-Date: 2004-06-17 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -18,11 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -37,11 +32,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -76,9 +72,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "nu pot crea `%s': %s\n"
@@ -134,90 +130,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "eroare la crearea frazei-parol�: %s\n"
+
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "eroare la citire keyblock: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: eroare citire �nregistrare liber�: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' deja compresat\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "genereaz� o nou� perechi de chei"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "stergere keyblock a e�uat: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Generarea cheii a e�uat: %s\n"
+
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -305,15 +361,15 @@ msgstr "cheia secret� nu e disponibil�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
@@ -321,141 +377,150 @@ msgstr "Selec�ia d-voastr�? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "activ"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "activ"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Nici un motiv specificat"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "neprocesat"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferin�e actualizate"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter invalid �n �ir preferin�e\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter invalid �n �ir preferin�e\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "eroare: amprent� invalid�\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "afi�eaz� amprenta"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "eroare: amprent� invalid�\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -463,232 +528,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Selecta�i ce fel de cheie dori�i:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "termin�"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "t"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "comenzi �n conflict\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "ajutor"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "enumer�"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Cheie disponibil� la: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "depanare"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "activ"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "semloc"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "schimb� data de expirare"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "ampr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "afi�eaz� amprenta"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsem"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "eroare general�"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "parola"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repeta�i fraza-parol�: "
+
+#: g10/cardglue.c:718
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 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,13 +785,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia `%s' nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -749,7 +836,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -768,7 +855,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -795,7 +882,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -899,27 +986,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %08lX: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %08lX: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:361
+#: g10/export.c:384
 #, fuzzy, 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"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
@@ -1098,15 +1185,15 @@ msgstr "nu face nici o schimbare"
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1114,7 +1201,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1134,15 +1221,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1152,7 +1239,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1160,73 +1247,73 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, 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"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1234,21 +1321,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1256,385 +1343,385 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru %s \"%s"
 "\"\n"
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, fuzzy, 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 "
 "(unsafe)\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nu este un set de carectere valid\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URI pentru serverul de chei\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, fuzzy
 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"
 
-#: g10/g10.c:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, fuzzy, 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"
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, fuzzy, 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"
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, fuzzy, 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"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, fuzzy, 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"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, fuzzy, 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"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id-utilizator"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id-utilizator"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1642,24 +1729,24 @@ 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:3832
+#: g10/g10.c:3865
 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:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
@@ -1668,27 +1755,27 @@ msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, fuzzy, 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"
 
-#: g10/getkey.c:2169
+#: g10/getkey.c:2189
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %08lX - ignorat�\n"
 
-#: g10/getkey.c:2400
+#: g10/getkey.c:2420
 #, 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"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %08lX: cheie secret� f�r� cheie public� - s�rit�\n"
@@ -2051,380 +2138,380 @@ msgstr "Nici un ajutor disponibil"
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "A�i semnat aceste ID-uri utilizator:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %08lX: nici un ID utilizator\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %08lX: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, fuzzy, 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"
 
-#: g10/import.c:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %08lX: nici un ID utilizator valid\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %08lX: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %08lX: cheie nou� - s�rit�\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, 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:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %08lX: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %08lX: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %08lX: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %08lX: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %08lX: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %08lX: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %08lX: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %08lX: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "key %08lX: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "key %08lX: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "key %08lX: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, fuzzy, 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"
 
-#: g10/import.c:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secret implicit: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %08lX: cheie secret� importat�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %08lX: deja �n inelul de chei secret\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %08lX: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, fuzzy, 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"
 
-#: g10/import.c:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %08lX: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %08lX: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %08lX: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, fuzzy, 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"
 
-#: g10/import.c:1318
+#: g10/import.c:1320
 #, fuzzy, 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"
 
-#: g10/import.c:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %08lX: nici o subcheie legat� de cheie\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %08lX: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %08lX: leg�tur� subcheie invalid�\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %08lX: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %08lX: nici o subcheie pentru revocarea cheii\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %08lX: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %08lX: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %08lX: am s�rit ID-ul utilizator '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %08lX: am s�rit subcheia\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, fuzzy, 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"
 
-#: g10/import.c:1514
+#: g10/import.c:1516
 #, fuzzy, 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"
 
-#: g10/import.c:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %08lX: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, fuzzy, 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"
 
-#: g10/import.c:1553
+#: g10/import.c:1555
 #, fuzzy, 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"
 
-#: g10/import.c:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %08lX: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, fuzzy, 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"
 
-#: g10/import.c:1729
+#: g10/import.c:1731
 #, fuzzy, 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 "
 "prezent�.\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %08lX: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %08lX: am ad�ugat semn�tura de cheie direct�\n"
@@ -2663,7 +2750,8 @@ 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
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i '?' pentru informa�ii suplimentare): "
 
 #: g10/keyedit.c:918
@@ -2736,7 +2824,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i?"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2767,7 +2855,7 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
@@ -3248,83 +3336,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de cheia %s "
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nu pot crea %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocat�] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [expir�: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [expir�: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �ncredere: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �ncredere: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revocat�] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expira"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3332,7 +3404,19 @@ 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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revocat�] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expira"
+
+#: g10/keyedit.c:2536
 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"
@@ -3341,7 +3425,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3350,45 +3434,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�tur�.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3398,34 +3482,34 @@ msgstr ""
 "revocator          desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3433,129 +3517,129 @@ msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i revocator "
 "desemnat? (d/N): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, fuzzy, 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"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nici o cheie secundar� cu indicele %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   semnat� de %08lX la %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator:\n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat de %08lX la %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 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:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, 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"
@@ -3597,12 +3681,12 @@ msgstr "scriu auto semn�tur�\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@ -3670,91 +3754,60 @@ msgstr "   (%d) DSA (numai semn�tur�)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (numai cifrare)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (numai cifrare)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semn�tur�)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Pe cale s� genera�i o nou� pereche de chei %s.\n"
-"              lungimea minim� este  768 bits\n"
-"           lungimea implicit� este 1024 bits\n"
-" cea mai lung� cheie sugerat� este 2048 bits\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Ce lungime de cheie dori�i? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA permite numai chei de la 512 la 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "Perechea de chei DSA va avea 1024 bi�i.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Lungimi pentru chei mai mari de 2048 nu sunt sugerate\n"
-"deoarece calculele iau FOARTE MULT timp!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Sunte�i sigur(�) c� dori�i aceast� lungime de cheie?"
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Ce lungime de cheie dori�i? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� este "
-"de asemenea vulnerabil� la atacuri!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Lungimea cheii necesar� este %u bi�i\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3770,7 +3823,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3786,29 +3839,29 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Semn�tura este valid� pentru? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s nu expir� deloc\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s expir� la %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3816,12 +3869,12 @@ 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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect (d/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3839,44 +3892,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 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:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3887,27 +3940,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3915,12 +3968,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3931,7 +3984,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:1835
+#: g10/keygen.c:1847
 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"
@@ -3943,54 +3996,50 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "Perechea de chei DSA va avea 1024 bi�i.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, 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:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -4000,12 +4049,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o cheie secundar� pentru\n"
 "acest scop.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4013,7 +4062,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4021,40 +4070,40 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOT�: cheia secret� %08lX a expirat la %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4100,28 +4149,28 @@ msgstr "Inel de chei"
 msgid "expired: %s)"
 msgstr " [expir�: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Amprent� cheie ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4474,7 +4523,7 @@ msgstr "binar"
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "necunoscut"
 
@@ -4506,29 +4555,41 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nu pot deactiva generarea fi�ierelor core: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: citirea a e�uat (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Algoritme experimentale nu ar trebui folosite!\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
+
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "algoritm cifrare neimplementat"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"acest algoritm de cifrare este �nvechit; v� rug�m folosi�i unul standard!\n"
+"for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4640,50 +4701,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "nu pot seta pid-ul client pentru agent\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "nu pot convinge serverul s� citeasc� FD pentru agent\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "nu pot convinge serverul s� scrie FD pentru agent\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4695,41 +4756,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit cheia %s, ID %08lX, creat� %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "r�spuns invalid de la agent\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "nu pot cere parola �n modul batch\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4739,17 +4800,17 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia\n"
 "secret� pentru utilizator: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, 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"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
@@ -4960,7 +5021,8 @@ 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
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Aceasta ar putea �nsemna c� semn�tura e falsificat�.\n"
 
 #: g10/pkclist.c:527
@@ -5066,28 +5128,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
@@ -5408,50 +5470,45 @@ msgstr "%s semn�tur� de la: \"%s\"\n"
 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:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "scriu �n `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, 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"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� `%s': duplicat�\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5639,12 +5696,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "linii de intrare mai lungi de %d caractere\n"
@@ -5694,85 +5751,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revocat�] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[expirat�] "
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "necunoscut"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "niciodat�     "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare pentru trustdb\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare pentru trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare pentru trustdb\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare pentru trustdb\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %08lX nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, 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"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, 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"
@@ -6082,6 +6174,65 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "algoritm rezumat `%s' este numai-citire �n acest� edi�ie\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 ""
+#~ "Pe cale s� genera�i o nou� pereche de chei %s.\n"
+#~ "              lungimea minim� este  768 bits\n"
+#~ "           lungimea implicit� este 1024 bits\n"
+#~ " cea mai lung� cheie sugerat� este 2048 bits\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permite numai chei de la 512 la 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "lungime cheie prea mic�; 1024 este cea mai mic� valoare permis� pentru "
+#~ "RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "lungime cheie prea mic�; 768 este cea mai mic� valoare permis�.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "lungime cheie prea mare; %d este cea mai mare valoare permis�.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "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?"
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Bine, dar �ine�i minte c� radia�ia monitorului �i tastaturii d-voastr� "
+#~ "este de asemenea vulnerabil� la atacuri!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Algoritme experimentale nu ar trebui folosite!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "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"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
 
@@ -6210,12 +6361,6 @@ 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"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revocat�] "
-
-#~ msgid "[expired] "
-#~ msgstr "[expirat�] "
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [expir�: %s]"
diff --git a/po/ru.po b/po/ru.po
index 07385d88b..9f8f85216 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -15,11 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "хэш-функция `%s' в данной версии только для чтения\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -34,11 +29,12 @@ msgstr "не могу создать главное число меньшее %d
 msgid "no entropy gathering module detected\n"
 msgstr "не найден модуль накопления энтропии\n"
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -71,9 +67,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "не могу создать `%s': %s\n"
@@ -128,90 +124,150 @@ msgstr ""
 "Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\n"
 "чтобы ОС могла получить большую энтропию! (Необходимо еще %d байт)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
+
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "ошибка чтения блока ключей: %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: ошибка чтения свободной записи: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' уже сжат\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "создать новую пару ключей"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "сбой при удалении блока ключа: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "Сбой при создании ключа: %s\n"
+
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -299,15 +355,15 @@ msgstr "секретный ключ не найден"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
@@ -315,141 +371,150 @@ msgstr "Ваш выбор (?-подробнее)? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Без указания причины"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "не выполнено"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "обновить предпочтения"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недопустимый символ в строке предпочтений\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "ошибка: неверный отпечаток\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "ошибка: неверный отпечаток\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -457,232 +522,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип ключа:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Выберите причину отзыва:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "Выход"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "показать эту справку"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Ключ доступен: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "сменить срок действия"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "показать отпечаток"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "общая ошибка"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "создать новую пару ключей"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Повторите пароль: "
+
+#: g10/cardglue.c:718
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -692,13 +779,13 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -741,7 +828,7 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -760,7 +847,7 @@ msgstr "использую алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -785,7 +872,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -886,27 +973,27 @@ msgstr "ВНИМАНИЕ: не могу удалить временный фай
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %08lX: не защищен - пропущен\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %08lX: PGP 2.x стиля - пропущен\n"
 
-#: g10/export.c:361
+#: g10/export.c:384
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %08lX не имеет SK контрольной суммы\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
@@ -1085,15 +1172,15 @@ msgstr "не делать никаких изменений"
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1101,7 +1188,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1121,18 +1208,18 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки (fingerprints)\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "О найденных ошибка сообщайте <[email protected]>.\n"
 "Подпишитесь на русскоязычную группу рассылки GnuPG-ru отправив письмо по "
 "адресу [email protected] с темой subscribe.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1142,7 +1229,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1150,463 +1237,463 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = sign found in group definition \"%s\"\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец у файла %s \"%s\"\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные установки владельца каталога %s \"%s\"\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к каталогу %s \"%s\"\n"
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "файл конфигурации содержит неизвестный параметр \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек старого формата `%s' проигнорирован\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл настроек `%s' не обнаружен\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл настроек `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "настройки взяты из файла `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра \"%s\" не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s недопустимая таблица символов\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URI сервера ключей\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заменит %s\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s недопустимо использовать с %s!\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифровки сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 1, 2 или 3\n"
 
-#: g10/g10.c:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой (0) режим S2K строго не рекомендуется\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s не работает пока с %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие \"%s\" в режиме %s\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key user-id"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key user-id"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "неудача при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "неудача при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "не удалось экспортировать ключ: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "неудача при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "неудача при обновлении на сервере ключей: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1614,23 +1701,23 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания должно содержать '@' символ\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил сертификации неверен\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL правил подписи неверен\n"
@@ -1639,28 +1726,28 @@ msgstr "заданный URL правил подписи неверен\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID Не найден]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %08lX - игнорирую\n"
 
-#: g10/getkey.c:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "используется вторичный ключ %08lX вместо главного %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %08lX: секретный ключ без открытого - пропущен\n"
@@ -2015,375 +2102,375 @@ msgstr "Нет доступной справки"
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизменённых секретных ключей: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Вы подписали данные User ID:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %08lX: не имеет User ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %08lX: HKP повреждение подключа исправлено\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %08lX: принят ключ без самоподписи '%s'\n"
 
-#: g10/import.c:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %08lX: нет действительных User ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %08lX: не найден открытый ключ: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %08lX: новый ключ - пропущен\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %08lX: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %08lX: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %08lX: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %08lX: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %08lX: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %08lX: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %08lX: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %08lX: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %08lX: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %08lX: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %08lX: \"%s\" не изменен\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %08lX: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %08lX: секретный ключ импортирован\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %08lX: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %08lX: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %08lX: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %08lX: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %08lX: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %08lX: нет User ID для подписи\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом у \"%s\" \n"
 
-#: g10/import.c:1318
+#: g10/import.c:1320
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %08lX: неправильная самоподпись на \"%s\"\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %08lX: нет подключа для связи ключей\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %08lX: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %08lX: неправильная связь подключей\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %08lX: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %08lX: нет подключа для отзыва ключа\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %08lX: неправильный отзыв подключа\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %08lX: удален многократный отзыв подключа\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %08lX: пропущен User ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %08lX: пропущен подключ\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %08lX: не экспортируемая подпись (класс %02x) - пропущена\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1516
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %08lX: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %08lX: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %08lX: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1555
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %08lX: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %08lX: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: запрашиваю ключ отзыва %08lX\n"
 
-#: g10/import.c:1729
+#: g10/import.c:1731
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %08lX возможно отозван: ключ отзыва %08lX не получен.\n"
 
-#: g10/import.c:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %08lX: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %08lX: direct key signature добавлена\n"
@@ -2620,7 +2707,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваш выбор? (введите '?' для большей информации): "
 
 #: g10/keyedit.c:918
@@ -2693,7 +2781,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2724,7 +2812,7 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
@@ -3203,83 +3291,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван ключом %s "
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "не могу создать %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[отозван]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3287,7 +3359,19 @@ msgstr ""
 "Заметьте, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[отозван]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3295,7 +3379,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID отмеченного как главный.  Данная команда может\n"
 "              использовать другой User ID в качестве главного.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3304,45 +3388,45 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы можете не добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3351,159 +3435,159 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Выделите не более одного вторичного ключа.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Смена срока действия вторичного ключа.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Нет вторичного ключа с индексом %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   подписан %08lX  %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок подписи закончился %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID:\n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   отозван %08lX  %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3545,12 +3629,12 @@ msgstr "сохраняем самоподпись\n"
 msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
@@ -3618,90 +3702,60 @@ msgstr "   (%d) DSA (только для подписи)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (только для шифрования)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (только для шифрования)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ключей.\n"
-"              минимальный размер ключа   768 бит\n"
-"              размер ключа по умолчанию 1024 бит\n"
-"      максимально рекомендуемый размер  2048 бит\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Какой размер ключа Вы выбрали? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA поддерживает размер ключа от 512 до 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "слишком малый размер ключа; 1024 - минимальный размер ключа RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "слишком малый размер ключа; 768 - минимально допустимый размер.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "слишком большой размер ключа; %d - максимально допустимый размер.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Размер ключа больше 2048 не рекомендуется, т.к.\n"
-"вычисления с ним займут МНОГО времени!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Вы действительно хотите иметь ключ такого размера? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Какой размер ключа Вы выбрали? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Отлично, только помните, что излучение монитора и клавиатуры\n"
-"также могут быть перехвачены!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "приведен к размеру %u бит\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3717,7 +3771,7 @@ msgstr ""
 "      <n>m = срок действия n месяцев\n"
 "      <n>y = срок действия n лет\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3733,29 +3787,29 @@ msgstr ""
 "      <n>m = срок действия подписи n месяцев\n"
 "      <n>y = срок действия подписи n лет\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Подпись действительна до? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "неправильное значение\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s не имеет ограничения срока действия\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s действителен до: %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3763,12 +3817,12 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, корректно обрабатываются даты до 2106.\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/n) "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3784,44 +3838,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используется таблица символов: `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3832,28 +3886,28 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя и комментарий\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1750
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3861,12 +3915,12 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3878,7 +3932,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3890,54 +3944,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "Пара ключей DSA будет иметь длину 1024 бита.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3946,60 +3996,60 @@ msgstr ""
 "можете\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "ПРЕДУПРЕЖДАЮ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой при удалении блока ключа: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕТЬТЕ: секретный ключ %08lX просрочен с %s\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4045,28 +4095,28 @@ msgstr "Таблица ключей"
 msgid "expired: %s)"
 msgstr " [годен до: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Отпечаток ключа ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4418,7 +4468,7 @@ msgstr "двоичный"
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "неизвестен"
 
@@ -4449,29 +4499,40 @@ msgstr "старый (PGP 2.x) стиль подписи\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "не могу отключить создание образа памяти (core dumps): %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "не могу открыть файл: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Использовать экспериментальные алгоритмы не рекомендуется!\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"не рекомендуем данный алгоритм шифрования; используйте более стандартный!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "нереализованный алгоритм шифрования"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s подпись, хэш-функция %s\n"
+
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "использование хэш-функции %s (%d) нарушает предпочтения получателя\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4580,50 +4641,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "не могу установить pid для агента\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "не могу получить дескриптор чтения для агента\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "не могу получить дескриптор записи для агента\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "коммуникационный проблемы с gpg-agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (главный идентификатор ключа %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4634,41 +4695,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %08lX, создан %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "пароль слишком длинный\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "неверный ответ от агента\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "проблема с агентом: агент вернул 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4678,17 +4739,17 @@ msgstr ""
 "Необходим пароль для доступа к секретному ключу пользователя:\n"
 "\""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %08lX, создан %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
@@ -4891,7 +4952,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван его владельцем!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Это может означать, что подпись поддельная.\n"
 
 #: g10/pkclist.c:527
@@ -4993,28 +5055,28 @@ msgstr "нет действительных адресов\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "нет подписанных данных\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
@@ -5328,50 +5390,45 @@ msgstr "%s подпись от: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "сохраняю в `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "использование хэш-функции %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "подписывание:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадёжным RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено `%s': дубликат\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5559,12 +5616,12 @@ msgstr "%s: сбой добавления записи: %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "таблица доверий повреждена; запустите \"gpg --fix-trustdb\".\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "не могу обработать строки текста длиннее %d символов\n"
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "строка ввода длиннее %d символов\n"
@@ -5614,85 +5671,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[отозван]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[просрочен]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "неизвестен"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "никогда   "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %08lX не найден: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %08lX не найден\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "запись о доверии %lu, тип %d: ошибка записи: %s\n"
@@ -6003,6 +6095,63 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "хэш-функция `%s' в данной версии только для чтения\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 ключей.\n"
+#~ "              минимальный размер ключа   768 бит\n"
+#~ "              размер ключа по умолчанию 1024 бит\n"
+#~ "      максимально рекомендуемый размер  2048 бит\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA поддерживает размер ключа от 512 до 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "слишком малый размер ключа; 1024 - минимальный размер ключа RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "слишком малый размер ключа; 768 - минимально допустимый размер.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "слишком большой размер ключа; %d - максимально допустимый размер.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Размер ключа больше 2048 не рекомендуется, т.к.\n"
+#~ "вычисления с ним займут МНОГО времени!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Вы действительно хотите иметь ключ такого размера? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Отлично, только помните, что излучение монитора и клавиатуры\n"
+#~ "также могут быть перехвачены!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Использовать экспериментальные алгоритмы не рекомендуется!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "не рекомендуем данный алгоритм шифрования; используйте более "
+#~ "стандартный!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "сохраняю в `%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "извините, но это невозможно выполнить в пакетном режиме\n"
 
@@ -6131,12 +6280,6 @@ msgstr ""
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? проблема проверки отзыва: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[отозван]"
-
-#~ msgid "[expired] "
-#~ msgstr "[просрочен]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [годен до: %s]"
diff --git a/po/sk.po b/po/sk.po
index 9791e12bc..b20bec900 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -13,11 +13,6 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "hashovac� algoritmus `%s' je len na ��tanie v tejto verzii\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -32,11 +27,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -69,9 +65,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "nem��em vytvori� `%s': %s\n"
@@ -124,90 +120,150 @@ 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:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' je u� skomprimovan�\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "vytvori� nov� p�r k���ov"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, 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:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -295,15 +351,15 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
@@ -311,141 +367,150 @@ msgstr "V� v�ber? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -453,232 +518,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, 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:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, 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:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "ukon�i�"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "u"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "v�eobecn� chyba"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Opakujte heslo: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -688,13 +775,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -737,7 +824,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -756,7 +843,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -782,7 +869,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -887,27 +974,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
@@ -1090,15 +1177,15 @@ msgstr "nevykona� �iadne zmeny"
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1107,7 +1194,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1127,17 +1214,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 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:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1147,7 +1234,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1155,471 +1242,471 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, 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:1182
+#: g10/g10.c:1217
 #, 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:1185
+#: g10/g10.c:1220
 #, 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:1191
+#: g10/g10.c:1226
 #, 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:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, 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:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, 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:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, 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:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 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:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 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:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key id u��vate�a"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key id u��vate�a"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 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:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1627,23 +1714,23 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1652,29 +1739,29 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
 # c-format
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, 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"
@@ -2032,383 +2119,383 @@ msgstr "Pomoc nie je k dispoz�cii"
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, 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:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, 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:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, 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:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, 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:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, 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:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, 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"
@@ -2647,7 +2734,8 @@ 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
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
 #: g10/keyedit.c:918
@@ -2721,7 +2809,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2752,7 +2840,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
@@ -3231,83 +3319,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[revokovan�]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3315,7 +3387,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[revokovan�]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3323,7 +3407,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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3332,45 +3416,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3379,159 +3463,159 @@ 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:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, 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:3054
+#: g10/keyedit.c:3051
 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:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 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:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, 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:3499
+#: g10/keyedit.c:3496
 #, 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:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3574,12 +3658,12 @@ msgstr "zapisujem podpis k���a sebou sam�m\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@ -3647,93 +3731,60 @@ msgstr "   (%d) DSA (len na podpis)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Chyst�m sa vytvori� nov� p�r k���ov %s.\n"
-"                       minim�lna ve�kos� k���a je  768 bitov\n"
-"                      implicitn� ve�kos� k���a je 1024 bitov\n"
-"            najvy��ia navrhovan� ve�kos� k���a je 2048 bitov\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Ak� ve�kos� k���a si prajete? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "k��� DSA mus� ma� ve�kos� od 512 do 1024 bitov.\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� pre RSA je 1024 "
-"bitov.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr ""
-"ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� je 768 bitov.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, 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
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "ve�kos� k���a je pr�li� ve�k�; maxim�lna povolen� hodnota je %d.\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Ve�kosti k���ov v��ie ako 2048 bitov se neodpor��aj�, preto�e\n"
-"v�po�ty potom trvaj� VE�MI dlho!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Skuto�ne chcete vytvori� k��� tejto d�ky? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Dobre, ale nezab�dajte, �e inform�cie m��u by� vyzraden� z po��ta�a aj "
-"elektromagnetick�m vy�arovan�m monitora alebo kl�vesnice!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Po�adovan� d�ka k���a je %u bitov.\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3749,7 +3800,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:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3765,29 +3816,29 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�� za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�� za n rokov\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3795,12 +3846,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3817,44 +3868,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3865,27 +3916,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3893,12 +3944,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3910,7 +3961,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3922,54 +3973,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, 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:2879
+#: g10/keygen.c:2891
 #, 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:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, 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:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3977,12 +4024,12 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -3990,7 +4037,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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3998,40 +4045,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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4077,28 +4124,28 @@ msgstr "s�bor k���ov (keyring)"
 msgid "expired: %s)"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4457,7 +4504,7 @@ msgstr "bin�rne"
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "nezn�me"
 
@@ -4488,30 +4535,41 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "nem��em vypn�� vytv�ranie core s�borov: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Experiment�lne algoritmy by sa nemali pou��va�!\n"
+#: g10/misc.c:299
+#, 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
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "�ifrovac� algoritmus nie je implementovan�"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"tento �ifrovac� algoritmus je zastaral�; pros�m, pou�ite nejak� "
-"�tandardnej��!\n"
+"vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4620,50 +4678,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "nem��em nastavi� PID klienta pre gpg-agenta\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "nemo�no z�ska� server read file descriptor pre agenta\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "nemo�no z�ska� server write file descriptor pre agenta\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4674,41 +4732,41 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "neplatn� reakcia od agenta\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4718,17 +4776,17 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -4934,7 +4992,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho vlastn�kom!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         To m��e znamena�, �e podpis je falo�n�.\n"
 
 #: g10/pkclist.c:527
@@ -5039,28 +5098,28 @@ msgstr "�iadne platn� adresy\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
@@ -5380,54 +5439,49 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "zapisujem do '%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem��em ho pou�i� s "
 "falo�n�m RNG!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5617,12 +5671,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "vstupn� riadok je dlh�� ako %d znakov\n"
@@ -5673,85 +5727,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[revokovan�]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[expirovan�]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "nezn�me"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@ -6060,6 +6149,66 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "hashovac� algoritmus `%s' je len na ��tanie v tejto verzii\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 ""
+#~ "Chyst�m sa vytvori� nov� p�r k���ov %s.\n"
+#~ "                       minim�lna ve�kos� k���a je  768 bitov\n"
+#~ "                      implicitn� ve�kos� k���a je 1024 bitov\n"
+#~ "            najvy��ia navrhovan� ve�kos� k���a je 2048 bitov\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "k��� DSA mus� ma� ve�kos� od 512 do 1024 bitov.\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� pre RSA je 1024 "
+#~ "bitov.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr ""
+#~ "ve�kos� k���a je pr�li� mal�; minim�lna povolen� ve�kos� je 768 bitov.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "ve�kos� k���a je pr�li� ve�k�; maxim�lna povolen� hodnota je %d.\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Ve�kosti k���ov v��ie ako 2048 bitov se neodpor��aj�, preto�e\n"
+#~ "v�po�ty potom trvaj� VE�MI dlho!\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Skuto�ne chcete vytvori� k��� tejto d�ky? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Dobre, ale nezab�dajte, �e inform�cie m��u by� vyzraden� z po��ta�a aj "
+#~ "elektromagnetick�m vy�arovan�m monitora alebo kl�vesnice!\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Experiment�lne algoritmy by sa nemali pou��va�!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "tento �ifrovac� algoritmus je zastaral�; pros�m, pou�ite nejak� "
+#~ "�tandardnej��!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "zapisujem do '%s'\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "nemo�no previes� v d�vkovom m�de\n"
 
@@ -6188,12 +6337,6 @@ msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? probl�m overenia revok�cie: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[revokovan�]"
-
-#~ msgid "[expired] "
-#~ msgstr "[expirovan�]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [platnos� skon��: %s]"
diff --git a/po/sv.po b/po/sv.po
index f9fce5c90..193fce8a9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,10 +10,7 @@
 # where corrected. The translations were checked for
 # consistency and some expressions where given new
 # translations.
-#
-# 2004, September 20: First Preliminary new translation.
-# This translation will be revised and corrected
-# during October 2004.
+# 2004/12/01 Per Tunedal
 # ===================================================
 #
 # First translator Daniel Resare <[email protected]>, 1999-2002,
@@ -24,40 +21,36 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.1\n"
+"Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
-"PO-Revision-Date: 2004-09-20 22:12+0100\n"
-"Last-Translator: Per Tunedal <[email protected]>\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgåva\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "kan inte skapa ett  primtal med mindre än %d bits\n"
+msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 
 #: cipher/primegen.c:311
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr "kan inte skapa ett  primtal med mindre än %d bits\n"
+msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 
 #: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
 msgstr "ingen demon för entropisamling hittad\n"
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -75,11 +68,11 @@ msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
 #: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "notera: filen random_seed är tom\n"
+msgstr "Obs: filen random_seed är tom\n"
 
 #: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "varning: slumpkärnan har en felaktig storlek och används därför inte\n"
+msgstr "VARNING: slumpkärnan har en felaktig storlek och används därför inte\n"
 
 #: cipher/random.c:415
 #, c-format
@@ -88,11 +81,11 @@ msgstr "kan inte läsa \"%s\": %s\n"
 
 #: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
-msgstr "notera: random_seed uppdaterades inte\n"
+msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "kan inte skapa \"%s\": %s\n"
@@ -148,102 +141,162 @@ 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:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "fel: ogiltigt fingeravtryck\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' är redan komprimerad\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "generera ett nytt nyckelpar"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "Nyckelgenereringen misslyckades: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
-#, fuzzy, c-format
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "hittade ingen giltig OpenPGP-data.\n"
+msgstr ""
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
-msgstr "skal: %s\n"
+msgstr "ASCII-skal: %s\n"
 
 #: g10/armor.c:346
 msgid "invalid armor header: "
-msgstr "felaktig rubrikrad i skalet: "
+msgstr "felaktig rubrikrad i ASCII-skalet: "
 
 #: g10/armor.c:353
 msgid "armor header: "
-msgstr "rad i skalet: "
+msgstr "rad i ASCII-skalet: "
 
 #: g10/armor.c:364
 msgid "invalid clearsig header\n"
@@ -256,18 +309,20 @@ msgstr "flera klartextsignaturer går in i varandra\n"
 #: g10/armor.c:551
 #, fuzzy
 msgid "unexpected armor: "
-msgstr "oväntat skal:"
+msgstr "oväntat ASCII-skal:"
 
+# rader i klartexten som inleds med bindestreck får ett extra bindestreck vid klartextsignatur (för att lättare hitta "---- Begin ..."
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
-msgstr "felaktig bindestreck-kodad rad: "
+msgstr "felaktig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
 #: g10/armor.c:715 g10/armor.c:1300
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "hoppade över ogiltigt radix64-tecken %02x \n"
+msgstr "hoppade över felaktigt radix64-tecken %02x \n"
 
+# CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
@@ -301,14 +356,14 @@ msgstr "hittade ingen giltig OpenPGP-data.\n"
 #: g10/armor.c:1120
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "felaktigt asciiI-skal: raden är längre än %d tecken\n"
+msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n"
 
 #: g10/armor.c:1124
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 "tecken kodade enligt \"quoted printable\"-standarden funna i skalet - detta\n"
-"beror sannolikt på att en felaktig epostserver eller epostklient har "
+"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
@@ -321,15 +376,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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
@@ -337,141 +392,150 @@ msgstr "Vad väljer du? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Ingen anledning har angivits"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "inte behandlade"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uppdaterat inställningar"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
-msgstr "Ogiltigt tecken i inställningssträngen\n"
+msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
-msgstr "Ogiltigt tecken i inställningssträngen\n"
+msgstr "felaktigt tecken i inställningssträngen\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fel: ogiltigt fingeravtryck\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -479,235 +543,255 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, 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:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "avsluta"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
-msgstr "list"
+msgstr "visa en lista"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Nyckeln tillgänglig hos: "
 
 # ???
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
-msgstr "debug"
+msgstr "avlusa"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "ändra utgångsdatum"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
 # originalet borde ha ett value
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
 # skall dessa översättas?
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "allmänt fel"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1297
-#, fuzzy
+#: g10/card-util.c:1387
 msgid "Admin commands are allowed\n"
-msgstr "motstridiga kommandon\n"
+msgstr ""
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1389
 msgid "Admin commands are not allowed\n"
-msgstr "skriver hemlig nyckel till \"%s\"\n"
+msgstr ""
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
-msgstr "Ogiltigt kommando (försök med \"help\")\n"
+msgstr "Felaktigt kommando (försök med \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Repetera lösenmeningen: "
+
+#: g10/cardglue.c:718
+#, 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:3544 g10/keyring.c:376
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -717,17 +801,17 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "fel vid läsninga av  nyckelblock: %s\n"
+msgstr "fel vid läsning av nyckelblock: %s\n"
 
 #: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
@@ -766,14 +850,14 @@ msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
 
 #: g10/encode.c:215
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "kan inte använda symetriska ESK-paket pga S2K-läge\n"
+msgstr "kan inte använda symmetriska ESK-paket pga S2K-läge\n"
 
 #: g10/encode.c:228
 #, c-format
@@ -785,7 +869,7 @@ msgstr "använderchiffer %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -793,7 +877,7 @@ msgstr "VARNING: \"%s\" är en tom fil\n"
 #: g10/encode.c:472
 msgid "you can only encrypt to RSA keys of 2048 bits or less in --pgp2 mode\n"
 msgstr ""
-"du kan endast krypterar till RSA nycklar som är högst 2048 bitar långa i --"
+"du kan endast kryptera till RSA nycklar som är högst 2048 bitar långa i --"
 "pgp2-läge\n"
 
 #: g10/encode.c:494
@@ -811,10 +895,10 @@ msgstr "kan inte använda IDEA-kryptering för alla nycklar du krypterar till.\n
 msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas "
+"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -827,7 +911,7 @@ msgstr ""
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
-"att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas "
+"att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
 #: g10/encode.c:805 g10/pkclist.c:721 g10/pkclist.c:757
@@ -850,12 +934,13 @@ msgstr "%s krypterad data\n"
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
 
+# I vissa algoritmer kan svaga nycklar förekomma. Dessa ska inte användas.
 #: g10/encr-data.c:92
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
-"VARNING: meddelandet krypterades med en svag nyckel i den symmetriska\n"
-"krypteringen.\n"
+"VARNING: meddelandet krypterades med en svag nyckel\n"
+"i den symmetriska krypteringen.\n"
 
 #: g10/encr-data.c:103
 msgid "problem handling encrypted packet\n"
@@ -875,7 +960,7 @@ msgstr "%s: kan inte skapa katalog: %s\n"
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
-"anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
+"anrop av externa program är avstängt pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
 #: g10/exec.c:355
@@ -921,27 +1006,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "nyckeln %08lX är inte skyddad - överhoppade över den\n"
+msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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"
+msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
@@ -963,7 +1048,7 @@ msgstr "|[fil]|skapa en klartext-signatur"
 
 #: g10/g10.c:362
 msgid "make a detached signature"
-msgstr "skapa en signatur i en separat fil"
+msgstr "skapa signatur i en separat fil"
 
 #: g10/g10.c:363
 msgid "encrypt data"
@@ -971,11 +1056,12 @@ msgstr "kryptera data"
 
 #: g10/g10.c:365
 msgid "encryption only with symmetric cipher"
-msgstr "endast symetrisk kryptering"
+msgstr "endast symmetrisk kryptering"
 
+# gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
 #: g10/g10.c:367
 msgid "decrypt data (default)"
-msgstr "dekryptera data (normalläge)"
+msgstr "dekryptera data (standard)"
 
 #: g10/g10.c:369
 msgid "verify a signature"
@@ -983,11 +1069,11 @@ msgstr "verifiera en signatur"
 
 #: g10/g10.c:371
 msgid "list keys"
-msgstr "räkna upp nycklar"
+msgstr "visa en lista på nycklar"
 
 #: g10/g10.c:373
 msgid "list keys and signatures"
-msgstr "räkna upp nycklar och signaturer"
+msgstr "visa en lista på nycklar och signaturer"
 
 #: g10/g10.c:374
 #, fuzzy
@@ -996,11 +1082,11 @@ msgstr "verifiera nyckelsignaturer"
 
 #: g10/g10.c:375
 msgid "list keys and fingerprints"
-msgstr "räkna upp nycklar och fingeravtryck"
+msgstr "visa en lista på nycklar och fingeravtryck"
 
 #: g10/g10.c:376
 msgid "list secret keys"
-msgstr "räkna upp hemliga nycklar"
+msgstr "visa en lista på hemliga nycklar"
 
 #: g10/g10.c:377
 msgid "generate a new key pair"
@@ -1074,6 +1160,7 @@ msgstr "uppdatera tillitsdatabasen"
 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:421 g10/gpgv.c:65
 msgid ""
 "@\n"
@@ -1098,7 +1185,7 @@ msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
 #: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|sätt kompressionsnivån till N (0 för att slå av kompression)"
+msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
 #: g10/g10.c:442
 msgid "use canonical text mode"
@@ -1120,15 +1207,17 @@ msgstr "gör inga ändringar"
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+# inställningar istället för flaggor?
+# Nej, här är det bruksanvisningen för kommandoraden.
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1136,7 +1225,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1152,21 +1241,22 @@ msgstr ""
 "\n"
 "-se -r Bo [fil]             signera och kryptera för användaren Bo\n"
 "--clearsign [fil]           skapa en klartextsignatur\n"
-"--detach-sign [fil]         skapa en signatur i en separat fil\n"
+"--detach-sign [fil]         skapa signatur i en separat fil\n"
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 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:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
-#: g10/g10.c:746
+# Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1176,7 +1266,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1184,478 +1274,476 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
-msgstr "öppen nyckel:"
+msgstr "öppen nyckel: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
-msgstr "Chiffer"
+msgstr "Chiffer: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
-msgstr "Komprimering:"
+msgstr "Komprimering: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, 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:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "OBS: inställningsfilen \"%s\" används inte\n"
+msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "läser flaggor från \"%s\"\n"
+msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s: felaktiga exportalternativ %d\n"
+msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
-msgstr "felaktiga exportalternativ\n"
+msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s: felaktiga importalternativ %d\n"
+msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
-msgstr "felaktiga importalternativ\n"
+msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s: felaktiga exportalternativ %d\n"
+msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
-msgstr "felaktiga exportalternativ\n"
+msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s: felaktiga importalternativ %d\n"
+msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
-msgstr "felaktiga importalternativ\n"
+msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s: felaktiga exportalternativ %d\n"
+msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
-msgstr "felaktiga exportalternativ\n"
+msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2350
+#: 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"
 
-#: g10/g10.c:2540
+# Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
+#: 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:2544
+#: 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:2553
+#: 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:2556
+#: 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:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr ""
-"du kan inte både signera och kryptera samtidigt tillsammans med --pgp2\n"
+msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 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) tillsammans med --pgp2\n"
+msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
-#: g10/g10.c:2602
+# IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
-"för att kryptera meddelanden med --pgp2 krävs IDEA-insticksprogrammet\n"
+"för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
-msgstr "den valda krypteringsalgoritmen är ogiltig\n"
+msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
-msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
+msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
-msgstr "den valda krypteringsalgoritmen är ogiltig\n"
+msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "den valda kontrollsummealgoritmen är ogiltig\n"
-
-# jag bedömer att detta och de följande är interna felmeddelanden
-# som det är i princip omöjligt att översätta på på ett bra sätt.
-# Sannolikheten för att användaren drabbas av felmeddelandet
-# är ändå litet. Eventuellt borde meddelandena inte alls
-# översättas för att göra eventuell felsökning lättare
-# för internationella felsökare
-#: g10/g10.c:2705
+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:2738
 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"
 
-#: g10/g10.c:2707
+# 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:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
-#: g10/g10.c:2709
+# Hur djupt GnuPG ska leta i Web-of-trust.
+#: g10/g10.c:2742
 #, 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"
 
-# cert-level? Vad är det?
-# inte testnivå i alla fall!
-# Kanske är det nivån för hur lång förtroendekedjan får vara?
-#: g10/g10.c:2711
+# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
+#: g10/g10.c:2744
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
-"ogiltigt standardvärde för certifikatnivån; måste vara 0, 1, 2 eller 3\n"
+"felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
-# testnivå!? Vad är detta???
-# längd på förtroendekedjan?
-#: g10/g10.c:2713
+# Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
+#: g10/g10.c:2746
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
-"ogiltigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
+"felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
-#: g10/g10.c:2716
+# S2K har med krypteringen av hemliga nyckeln att göra
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
+msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
-msgstr "ogiltiga standardinställningar\n"
+msgstr "felaktiga standardinställningar\n"
 
-#: g10/g10.c:2736
+# 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:2769
 msgid "invalid personal cipher preferences\n"
-msgstr "felaktiga inställningar av krypteringsalgoritm\n"
+msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
-msgstr "felaktiga inställningar av checksummealgoritm\n"
+msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
-msgstr "felaktiga inställningar av kompressionsalgoritm\n"
+msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
+msgstr ""
+"du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key användaridentitet"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key användaridentitet"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "misslyckades med att ta bort skalet: %s\n"
+msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "misslyckades med att skapa skal: %s\n"
+msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1663,55 +1751,57 @@ msgstr ""
 "ett notationsnamn kan bara innehålla bokstäver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-# user notation namme??
-#: g10/g10.c:3832
+# user notation name??
+# Werner:
+# That is an OpenPGP notation name not registered with IANA.
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
-msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknetr\n"
+msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 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:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
-msgstr "den angivna URL som beskriver certifikationspolicy är ogiltig\n"
+msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
-msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
+msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
+msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "för många poster i pk-cachen - inaktiverad\n"
+msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, 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"
@@ -1724,10 +1814,12 @@ msgstr "var något tystare"
 msgid "take the keys from this keyring"
 msgstr "ta nycklarna från denna nyckelring "
 
-# vad menas?
+# 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
 msgid "make timestamp conflicts only a warning"
-msgstr "konflikter vid utförande av tidsstämpling enbart en varning"
+msgstr "utfärda enbart en varning när tidsstämpeln är orimlig"
 
 #: g10/gpgv.c:72
 msgid "|FD|write status info to this FD"
@@ -1828,11 +1920,11 @@ msgstr "Ange namnet på nyckelns ägare"
 
 #: g10/helptext.c:121
 msgid "please enter an optional but highly suggested email address"
-msgstr "ange en epostadress. Detta är valfritt men rekommenderas varmt"
+msgstr "ange en e-postadress. Detta är frivilligt, men rekommenderas varmt"
 
 #: g10/helptext.c:125
 msgid "Please enter an optional comment"
-msgstr "Ange en valfri kommentar"
+msgstr "Ange en kommentar (frivilligt)"
 
 #: g10/helptext.c:130
 msgid ""
@@ -1844,7 +1936,7 @@ msgid ""
 msgstr ""
 "N  för att ändra namnet.\n"
 "C  för att ändra kommentaren.\n"
-"E  för att ändra epostadressen.\n"
+"E  för att ändra e-postadressen.\n"
 "O  för att fortsätta med nyckelgenerering.\n"
 "Q  för att avsluta nyckelgenereringen."
 
@@ -2049,8 +2141,8 @@ 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 ""
-"Du borde ange en anledning till certifikationen. Beroende på sammanhanget\n"
-"har du möjligheten att välja från följande lista:\n"
+"Du borde ange en anledning till spärren. Beroende på sammanhanget\n"
+"har du möjlighet att välja från följande lista:\n"
 "  \"Nyckeln har tappat sin säkerhet\"\n"
 "     Använd denna om du har anledning att tro att icke auktoriserade "
 "personer\n"
@@ -2061,7 +2153,7 @@ msgstr ""
 "     Använd denna om du har pensionerat denna nyckel.\n"
 "  \"Användaridentiteten är inte längre giltig\"\n"
 "     Använd denna för att visa att denna användaridentitet inte längre\n"
-"     skall användas. Detta används normalt för att visa att en epostadress\n"
+"     skall användas. Detta används normalt för att visa att en e-postadress\n"
 "     är ogiltig.\n"
 
 #: g10/helptext.c:271
@@ -2084,397 +2176,396 @@ 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:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya spärrar av nycklar: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-# eller är det en skadad HKP-nyckel som reparerats?
-# Jag tror att undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:713
+# Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "nyckeln %08lX: HKP skadad undernyckel har reparerats!\n"
+msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, 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:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "nyckel %08lX: importerade öppen nyckel  \"%s\"\n"
+msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "inga standardnyckelringar: %s\n"
+msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, 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:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, 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:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "nyckel %08lX: tog bort ogiltig spärr av undernyckel\n"
+msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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"
 
-# Vad skippades? nyckeln eller spärrcertifikatet??
-#: g10/import.c:1514
+#: g10/import.c:1516
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "nyckel %08lX: spärrcertifikat på fel plats - hoppade över\n"
+msgstr ""
+"nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr ""
-"nyckel %08lX: felaktigt sp?rrcertifikat (revocation certificate): %s - "
-"hoppade ?ver\n"
+msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-# signaturen?
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
-"nyckel %08lX: signatur på undernyckel på fel plats - hoppade över den\n"
+"nyckel %08lX: signatur på undernyckel på fel plats - hoppade över "
+"signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1553
+#: g10/import.c:1555
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "nyckel %08lX: oväntad signaturklass  (0x%02X) - överhoppad\n"
+msgstr ""
+"nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-#: g10/import.c:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "nyckel %08lX: användaridentitet hittades två gånger - slog ihop\n"
+msgstr ""
+"nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "nyckel %08lX: lagt till direkt nyckelignatur\n"
+msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
 #: g10/keydb.c:167
 #, c-format
@@ -2552,7 +2643,7 @@ msgstr ""
 #: g10/keyedit.c:406 g10/pkclist.c:274
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = Jag litar maginellt på denna användare\n"
+msgstr " %d = Jag litar marginellt på denna användare\n"
 
 #: g10/keyedit.c:407 g10/pkclist.c:276
 #, fuzzy, c-format
@@ -2657,7 +2748,7 @@ msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
 #: g10/keyedit.c:793
 msgid "This key has expired!"
-msgstr "Notera: Giltighetstiden för denna nyckel har gått ut!"
+msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
 #: g10/keyedit.c:813
 #, c-format
@@ -2712,7 +2803,8 @@ 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
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
 #: g10/keyedit.c:918
@@ -2736,7 +2828,7 @@ msgstr ""
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
-"VARNING: Signaturen kommer att markeras som icke exporterbar.\n"
+"VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
 #: g10/keyedit.c:939
@@ -2744,7 +2836,7 @@ msgstr ""
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
-"VARNING: Signaturen kommer att markeras som icke möjlig att återkalla.\n"
+"VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
 #: g10/keyedit.c:949
@@ -2789,7 +2881,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2820,7 +2912,7 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
@@ -2829,7 +2921,7 @@ msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"Du vill inte ha någon lösenmening - detta är sannolikt en dålig idé!\n"
+"Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
 #: g10/keyedit.c:1135
@@ -2860,7 +2952,7 @@ msgstr "visa fingeravtryck"
 
 #: g10/keyedit.c:1251
 msgid "list key and user IDs"
-msgstr "räkna upp nycklar och användaridentiteter"
+msgstr "visa en lista på nycklar och användaridentiteter"
 
 #: g10/keyedit.c:1253
 msgid "uid"
@@ -2884,7 +2976,7 @@ msgstr "check"
 
 #: g10/keyedit.c:1255
 msgid "list signatures"
-msgstr "räkna upp signaturer"
+msgstr "visa en lista på signaturer"
 
 #: g10/keyedit.c:1256
 msgid "c"
@@ -2910,7 +3002,7 @@ msgstr "sign"
 #: g10/keyedit.c:1259
 #, fuzzy
 msgid "make a trust signature"
-msgstr "skapa en signatur i en separat fil"
+msgstr "skapa signatur i en separat fil"
 
 #: g10/keyedit.c:1260
 msgid "lsign"
@@ -2946,11 +3038,11 @@ msgstr "lägg till en användaridentitet"
 
 #: g10/keyedit.c:1265
 msgid "addphoto"
-msgstr "lägg till bild"
+msgstr "addphoto"
 
 #: g10/keyedit.c:1265
 msgid "add a photo ID"
-msgstr "lägg till en användaridentitet med foto"
+msgstr "lägg till ett foto som användaridentitet"
 
 #: g10/keyedit.c:1266
 msgid "deluid"
@@ -2962,7 +3054,7 @@ msgstr "ta bort en användaridentitet"
 
 #: g10/keyedit.c:1268
 msgid "delphoto"
-msgstr "ta bort bild"
+msgstr "delphoto"
 
 #: g10/keyedit.c:1269
 msgid "addkey"
@@ -2999,7 +3091,7 @@ msgstr "ta bort en undernyckel"
 
 #: g10/keyedit.c:1275
 msgid "addrevoker"
-msgstr "Ange spärrnyckel"
+msgstr "addrevoker"
 
 #: g10/keyedit.c:1275
 msgid "add a revocation key"
@@ -3023,7 +3115,7 @@ msgstr "ändra utgångsdatum"
 
 #: g10/keyedit.c:1278
 msgid "primary"
-msgstr "huvud"
+msgstr "primary"
 
 #: g10/keyedit.c:1278
 msgid "flag user ID as primary"
@@ -3035,7 +3127,7 @@ msgstr "toggle"
 
 #: g10/keyedit.c:1279
 msgid "toggle between secret and public key listing"
-msgstr "hoppa mellan utskrift av hemliga och öppna nycklar"
+msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
 #: g10/keyedit.c:1281
 msgid "t"
@@ -3047,7 +3139,7 @@ msgstr "pref"
 
 #: g10/keyedit.c:1282
 msgid "list preferences (expert)"
-msgstr "skriv ut inställningar (expertläge)"
+msgstr "visa en lista på  inställningar (expertläge)"
 
 #: g10/keyedit.c:1283
 msgid "showpref"
@@ -3055,7 +3147,7 @@ msgstr "showpref"
 
 #: g10/keyedit.c:1283
 msgid "list preferences (verbose)"
-msgstr "skriv ut inställningar (utförligt)"
+msgstr "visa en lista på inställningar (utförligt)"
 
 #: g10/keyedit.c:1284
 msgid "setpref"
@@ -3127,7 +3219,7 @@ msgstr "disable"
 
 #: g10/keyedit.c:1292
 msgid "disable a key"
-msgstr "deaktivera en nyckel"
+msgstr "stäng av en nyckel"
 
 #: g10/keyedit.c:1293
 msgid "enable"
@@ -3139,16 +3231,16 @@ msgstr "aktivera en nyckel"
 
 #: g10/keyedit.c:1294
 msgid "showphoto"
-msgstr "visa bild"
+msgstr "showphoto"
 
 #: g10/keyedit.c:1294
 msgid "show photo ID"
-msgstr "visa bild-ID"
+msgstr "visa foto-ID"
 
 #: g10/keyedit.c:1347
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "fel vid läsning av hemlig nyckel\"%s\": %s\n"
+msgstr "fel vid läsning av hemligt nyckelblock\"%s\": %s\n"
 
 #: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
@@ -3173,7 +3265,7 @@ msgstr "Vill du verkligen signera alla användaridentiteter? "
 
 #: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "Tips: Välj det användarid du vill signera\n"
+msgstr "Tips: Välj de användarID:n du vill signera\n"
 
 #: g10/keyedit.c:1527
 #, c-format
@@ -3289,11 +3381,11 @@ msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
 #: g10/keyedit.c:1924
 msgid "Digest: "
-msgstr "Sammandrag:"
+msgstr "Sammandrag: "
 
 #: g10/keyedit.c:1976
 msgid "Features: "
-msgstr "Funktioner:"
+msgstr "Funktioner: "
 
 #: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
@@ -3303,92 +3395,88 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
-msgstr "Denna nyckel har deaktiverats"
+msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[spärrad]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
-"om du inte startar om  programmet.\n"
+"om du inte startar om programmet.\n"
+
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[spärrad]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2536
 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"
@@ -3397,7 +3485,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3407,46 +3495,46 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 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:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "Du kan inte lägga till ett bild-ID till en nyckel av PGP 2-typ.\n"
+msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 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:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3455,33 +3543,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:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
-msgstr "Ange användar-ID för spärrnyckeln:"
+msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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"
+msgstr "det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
-msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n"
+msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3489,133 +3577,135 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "Vill du verkligen sp?rra denna nyckel? "
+msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:3499
+# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "Vill du verkligen sp?rra denna nyckel? "
+msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen undernyckel med index %d\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, 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"
@@ -3623,7 +3713,7 @@ msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n"
 #: g10/keygen.c:293
 #, fuzzy, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "inställningen %c%lu är dubblerad\n"
+msgstr "inställningen %c%lu förekommer flera gånger\n"
 
 #: g10/keygen.c:300
 #, fuzzy
@@ -3643,7 +3733,7 @@ msgstr "för många `%c' inställningar\n"
 #: g10/keygen.c:401
 #, fuzzy, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "Ogiltigt tecken i inställningssträngen\n"
+msgstr "felaktigt tecken i inställningssträngen\n"
 
 #: g10/keygen.c:827
 msgid "writing direct signature\n"
@@ -3657,12 +3747,12 @@ msgstr "skriver egensignatur\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
+msgstr "felaktig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -3730,92 +3820,61 @@ msgstr "   (%d) DSA (endast signering)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (endast signering)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (endast kryptering)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Kommer att generera ett nytt %s nyckelpar.\n"
-"              den minimala nyckelstorleken är  768 bitar\n"
-"              den förvalda nyckelstorleken är 1024 bitar\n"
-"    den största föreslagna nyckelstorleken är 2048 bitar\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "Vilken nyckelstorlek vill du ha? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"nyckelstorleken är för liten; 1024 är det minsta tillåtna värdet för RSA.\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "nyckelstorleken är för liten; 768 är det minsta tillåtna värdet.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "nyckelstorleken är för stor; %d är det största tillåtna värdet\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Nyckelstorlekar större än 2048 är inte att rekommendera\n"
-"eftersom beräkningar tar MYCKET lång tid!\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "Vilken nyckelstorlek vill du ha? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n"
-"avslöjande strålning som kan avlyssnas!\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Den efterfrågade nyckelstorleken är %u bitar\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, 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:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3832,7 +3891,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:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3848,29 +3907,29 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "För hur lång tid ska signaturen vara giltig? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
-msgstr "ogiltigt värde\n"
+msgstr "felaktigt värde\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "Giltighetstiden för %s går aldrig ut\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "Giltighetstiden för %s går ut vid följande tidpunkt: %s\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3878,12 +3937,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta (j/n)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3895,49 +3954,49 @@ msgid ""
 msgstr ""
 "\n"
 "Du behöver en användaridentitet för att identifiera din nyckel; mjukvaran\n"
-"konstruerar en användaridentitet från namn, kommentar och epostadress\n"
+"konstruerar en användaridentitet från namn, kommentar och e-postadress\n"
 "enligt följande form: \n"
 "     \"Gustav Vasa (Brutal kung) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
-msgstr "Ogiltigt tecken i namnet\n"
+msgstr "Felaktigt tecken i namnet\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
-msgstr "Epostadress: "
+msgstr "E-postadress: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
-msgstr "Epostadressen är ogiltig\n"
+msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
-msgstr "Ogiltigt tecken i kommentaren\n"
+msgstr "Felaktigt tecken i kommentaren\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckenuppsättningen \"%s\"\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3948,29 +4007,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "Ange inte epostadressen som namn eller kommentar\n"
+msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
 # Ej solklart vad förkortningarna står för
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3978,12 +4037,12 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3994,7 +4053,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:1835
+#: g10/keygen.c:1847
 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"
@@ -4006,69 +4065,65 @@ 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:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den öppna nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "hittade ingen öppen nyckelring att skriva till: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
+msgstr "hittade ingen hemlig nyckelring som gick att skriva till: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av öppna nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "den öppna och den  hemliga nyckeln är skapade och signerade.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
 msgstr ""
-"Notera att denna nyckel inte kan användas för kryptering. Du kommer\n"
+"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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4076,7 +4131,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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4084,40 +4139,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:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "OSERVERA: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
+msgstr "OBS: att skapa undernycklar till v3-nycklar bryter mot OpenPGP\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vill du verkligen skapa? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att radera nyckelblock: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4128,11 +4183,11 @@ msgstr "aldrig"
 
 #: g10/keylist.c:201
 msgid "Critical signature policy: "
-msgstr "FELAKTIG signatur fr?n \""
+msgstr "Viktig signaturpolicy: "
 
 #: g10/keylist.c:203
 msgid "Signature policy: "
-msgstr "Signatur-policy: "
+msgstr "Signaturpolicy: "
 
 #: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
@@ -4140,15 +4195,15 @@ msgstr ""
 
 #: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
-msgstr "VARNING: ogiltig notationsdata hittades\n"
+msgstr "VARNING: ogiltig noteringsdata hittades\n"
 
 #: g10/keylist.c:309
 msgid "Critical signature notation: "
-msgstr "FELAKTIG signatur fr?n \""
+msgstr "Viktig signaturnotation: "
 
 #: g10/keylist.c:311
 msgid "Signature notation: "
-msgstr "Signatur-notering:"
+msgstr "Signaturnotering: "
 
 #: g10/keylist.c:322
 msgid "not human readable"
@@ -4163,37 +4218,37 @@ msgstr "Nyckelring"
 msgid "expired: %s)"
 msgstr "[går ut: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
-msgstr "   Undernyckelns fingeravtryck:"
+msgstr "    Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
-msgstr "   Undernyckelns fingeravtryck:"
+msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
 #: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "misslyckades med att skapa skal: %s\n"
+msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-# märkligt felmeddelande, kolla upp
+# Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
@@ -4389,16 +4444,10 @@ msgstr "lösenmening skapad  med okänd sammandragsalgoritm %d\n"
 msgid "public key is %s\n"
 msgstr "den öppna nyckeln är %08lX\n"
 
-# DEK betyder Data Encryption Key, Meddelandet är förvirrande
-# men efter att ha kikat i koden har jag kommit fram till att
-# meddelandet bara visas om verbose-flaggan är satt, och då
-# markerar meddelandet att get_session_key lyckades hitta
-# rätt publik nyckel att kryptera datat med. Jag tycker
-# inte att svenska översättningen är mycket obskyrare än engelska
-# originalet iallafall.
+# Men jag ändrade så det blev närmare originalet. Per
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "data krypterad med öppen nyckel: korrekt krypteringsnyckel\n"
+msgstr "Data krypterat till öppen nyckel: Giltig DEK\n"
 
 #: g10/mainproc.c:461
 #, fuzzy, c-format
@@ -4446,10 +4495,12 @@ msgstr ""
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
+# Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
 #: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
+# Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
 #: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
@@ -4461,7 +4512,7 @@ msgstr "dekrypteringen misslyckades: %s\n"
 
 #: g10/mainproc.c:610
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "OBS: avsändaren efterfrågade \"endast-för-dina-ögon\"\n"
+msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
 #: g10/mainproc.c:612
 #, c-format
@@ -4516,6 +4567,8 @@ msgstr "Giltighetstiden har upphört för signatur från \""
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \""
 
+# Visas vid ogiltig signatur:
+# Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
 msgstr "[osäkert]"
@@ -4548,7 +4601,7 @@ msgstr "binär"
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "okänd"
 
@@ -4565,7 +4618,7 @@ msgstr "detta är inte någon signatur i en separat fil\n"
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
-"VARNING: multipla signaturerer upptäckta. Endast den första kommer att "
+"VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
 #: g10/mainproc.c:1811
@@ -4581,30 +4634,40 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "kan inte deaktivera minnesutskrifter: %s\n"
+msgstr "kan inte stänga av minnesutskrifter: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr ""
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Experimentella algoritmer bör inte användas!\n"
+#: g10/misc.c:299
+#, 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:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr ""
-"denna krypteringsalgoritm är föråldrad, använd istället en mer normal "
-"algoritm!\n"
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "krypteringsalgorimten är inte införd"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s signatur, sammandragsalgoritm %s\n"
+
+#: g10/misc.c:334
+#, 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
 msgid "the IDEA cipher plugin is not present\n"
@@ -4647,7 +4710,7 @@ msgstr "detta meddelande kanske inte kan användas av %s\n"
 #: g10/misc.c:973
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "läser flaggor från \"%s\"\n"
+msgstr "läser inställningar från \"%s\"\n"
 
 #: g10/misc.c:998
 #, fuzzy, c-format
@@ -4712,52 +4775,52 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 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"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
 # vad är detta?
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "kan inte ange pid för GPG-Agent\n"
 
 # FD?
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "kan inte få server-läs FD för GPG-Agent\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "kan inte få server-skriv FD för GPG-Agent\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "problem vid kommunikation med GPG-Agent\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
-msgstr "problem med GPG-Agent, inaktiverar den\n"
+msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4768,41 +4831,41 @@ msgstr ""
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "lösenmeningen är för lång\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "felaktigt svar från GPG-Agent\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "kan inte fråga efter lösenmening i batch-läge\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Ange lösenmening: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4812,17 +4875,17 @@ msgstr ""
 "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
@@ -4854,10 +4917,11 @@ msgstr "Kan inte öppna fotot \"%s\": %s\n"
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
+# Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
 #: g10/photoid.c:104
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
-msgstr "Vill du verkligen sp?rra denna nyckel? "
+msgstr "Vill du verkligen använda det (j/N)?"
 
 #: g10/photoid.c:119
 #, fuzzy, c-format
@@ -4877,7 +4941,7 @@ msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
-# känns inte heller bra
+# känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
 #: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
@@ -4896,11 +4960,11 @@ msgstr "Användaridentiteten är inte längre giltig"
 
 #: g10/pkclist.c:73
 msgid "reason for revocation: "
-msgstr "Anledning till spärren: "
+msgstr "anledning till spärren: "
 
 #: g10/pkclist.c:90
 msgid "revocation comment: "
-msgstr "Spärrkommentar: "
+msgstr "spärrkommentar: "
 
 # ej kristallklart vad förkortningarna står för
 #: g10/pkclist.c:205
@@ -4924,7 +4988,7 @@ msgstr ""
 msgid ""
 "How much do you trust that this key actually belongs to the named user?\n"
 msgstr ""
-"%08lX: Det finns inget som indikerar att signaturen verkligen tillhör "
+"%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
 "ägaren.\n"
 
 #: g10/pkclist.c:270
@@ -4952,11 +5016,10 @@ msgstr " m = gå tillbaka till huvudmenyn\n"
 msgid "  s = skip this key\n"
 msgstr " s = hoppa över denna nyckel\n"
 
-# q skall bytas ut mot a såfort det kollas upp så att q också funkar.
 #: g10/pkclist.c:288
 #, fuzzy
 msgid "  q = quit\n"
-msgstr " q = avsluta\n"
+msgstr "a = avsluta\n"
 
 #: g10/pkclist.c:292
 #, c-format
@@ -4982,14 +5045,14 @@ msgstr "Certifikat som leder till en nyckel med förbehållslöst förtroende:\n
 #, fuzzy, c-format
 msgid "%s: There is no assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Det finns inget som indikerar att signaturen verkligen tillhör "
+"%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
 "ägaren.\n"
 
 #: g10/pkclist.c:423
 #, fuzzy, c-format
 msgid "%s: There is limited assurance this key belongs to the named user\n"
 msgstr ""
-"%08lX: Det finns inget som indikerar att signaturen verkligen tillhör "
+"%08lX: Det finns inget som tyder på att signaturen verkligen tillhör "
 "ägaren.\n"
 
 #: g10/pkclist.c:429
@@ -5027,14 +5090,15 @@ msgstr "VARNING: denna nyckel kan ha spärrats: Spärrnyckeln saknas.\n"
 
 #: g10/pkclist.c:517
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n"
+msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
 #: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin ägare!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Detta kan betyda att signaturen är en förfalskning.\n"
 
 #: g10/pkclist.c:527
@@ -5043,11 +5107,11 @@ msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 
 #: g10/pkclist.c:532
 msgid "Note: This key has been disabled.\n"
-msgstr "Notera: Denna nyckel har deaktiverats.\n"
+msgstr "Obs: Denna nyckel har stängts av.\n"
 
 #: g10/pkclist.c:537
 msgid "Note: This key has expired!\n"
-msgstr "Notera: Denna nyckel har gått ut!\n"
+msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
 #: g10/pkclist.c:548
 msgid "WARNING: This key is not certified with a trusted signature!\n"
@@ -5116,7 +5180,7 @@ msgstr "hoppade över: den öppna nyckeln är redan satt som förvald mottagare\
 
 #: g10/pkclist.c:867
 msgid "Public key is disabled.\n"
-msgstr "Den öppna nyckeln är deaktiverad\n"
+msgstr "Den öppna nyckeln är avstängd.\n"
 
 #: g10/pkclist.c:874
 msgid "skipped: public key already set\n"
@@ -5130,39 +5194,42 @@ msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 #: g10/pkclist.c:948
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "hoppade över %s: den öppna nyckeln är deaktiverad\n"
+msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
 
+# plural av adressee
+# dvs. den som meddelandet är adresserat till.
+# Åtskillnad görs mellan adressee och receiver.
 #: g10/pkclist.c:1003
 msgid "no valid addressees\n"
-msgstr "inga giltiga adresser\n"
+msgstr "inga giltiga adressater\n"
 
 #: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, fuzzy, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -5224,9 +5291,14 @@ msgstr "(Detta är en känslig spärrnyckel)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 
+# --force översatt med:
+# genomdriv (använd alltid?)
+# -do-not-force översatt med:
+# genomdriv inte
+# I detta fall gäller det ett revokeringscertifikat, som gnupg alltid skapar i ASCII-format för att det ska gå att skriva ut.
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
-msgstr "utdata med ett ascii-skal valt.\n"
+msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
 #: g10/revoke.c:307 g10/revoke.c:525
@@ -5285,8 +5357,8 @@ msgstr ""
 "Var vänlig flytta det till ett media du kan gömma; om Mallory får\n"
 "får tillgång till detta certificate kan han göra din nyckel oanvändbar.\n"
 "Det är klokt att skriva ut detta certifikat och gömma det, ifall ditt\n"
-"media blir oläsligt.  But have some caution:  The print system of\n"
-"your machine might store the data and make it available to others!\n"
+"media blir oläsligt.  Men se upp:  Utskriftsfunktionen på\n"
+"din dator kan spara data så att det blir åtkomligt för andra!\n"
 
 #: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
@@ -5303,7 +5375,7 @@ msgstr "(Troligen vill du välja %d här)\n"
 
 #: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "Skriv en frivillig beskrivning; avsluta med en tom rad:\n"
+msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
 #: g10/revoke.c:673
 #, c-format
@@ -5344,7 +5416,7 @@ msgstr "Fel lösenmening; försök igen!"
 msgid "%s ...\n"
 msgstr "%s ...\n"
 
-# är det nyckeln som är svag, konstigt
+# 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
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "VARNING: Upptäckte en svag nyckel - byt lösenmening igen.\n"
@@ -5385,7 +5457,7 @@ msgstr "VARNING: Signeringsundernyckeln %08lX är inte korscertifierad\n"
 #, fuzzy, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr ""
-"WARNING signeringsundernyckel  %08lX har en ogiltig korscertiifiering\n"
+"VARNING signeringsundernyckel  %08lX har en ogiltig korscertiifiering\n"
 
 # behövs verkligen c-format här?
 #: g10/sig-check.c:168
@@ -5430,12 +5502,13 @@ msgstr ""
 #: g10/sig-check.c:532
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
-msgstr "nyckel %08lX: ingen undernyckel för spärr av undernyckel\n"
+msgstr "nyckel %08lX: ingen undernyckel till paket för spärr av undernyckel\n"
 
 #: g10/sig-check.c:558
 #, fuzzy, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
-msgstr "nyckel %08lX: ingen anv?ndaridentitet f?r signaturen\n"
+msgstr ""
+"nyckel %08lX: ingen undernyckel till signatur för bindning av undernyckel\n"
 
 # notation data?
 #: g10/sign.c:85
@@ -5498,14 +5571,9 @@ msgstr "%s signatur från: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
-" i --pgp2-läge\n"
+"när du är i --pgp2-läge\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "skriver till \"%s\"\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5513,44 +5581,43 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
-"du kan endast krypterar till RSA nycklar som ?r h?gst 2048 bitar l?nga i --"
-"pgp2-l?ge\n"
+"du kan bara göra klartextsignaturer med en PGP 2.x-nyckel\n"
+"när du är i --pgp2-läge\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
-# bubblerad?
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "hoppade över \"%s\": kopia\n"
+msgstr "hoppade över \"%s\": förekommer flera gånger\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över  `%s': %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5603,7 +5670,7 @@ msgstr "fel vid sökning av tillitsvärde: %s\n"
 #: g10/tdbdump.c:218
 #, fuzzy, c-format
 msgid "read error in `%s': %s\n"
-msgstr "Läsfel:  %s\n"
+msgstr "läsfel:  %s\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
@@ -5653,7 +5720,7 @@ msgstr "%s: misslyckades med att skapa versionspost: %s"
 #: g10/tdbio.c:554
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s: felaktig tillitsdatabas skapad\n"
+msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
 #: g10/tdbio.c:557
 #, c-format
@@ -5667,7 +5734,7 @@ msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 #: g10/tdbio.c:614
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s: felaktig tillitsdatabas\n"
+msgstr "%s: ogiltig tillitsdatabas\n"
 
 #: g10/tdbio.c:646
 #, c-format
@@ -5739,12 +5806,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "indataraden är längre än %d tecken\n"
@@ -5769,21 +5836,19 @@ msgstr "nyckel %08lX förekommer mer än en gång i tillitsdatabasen\n"
 #: g10/trustdb.c:310
 #, fuzzy, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
-msgstr ""
-"nyckel %08lX: hittade ingen motsvarande offentlig (publik) nyckel - ?"
-"verhoppad\n"
+msgstr "nyckel %08lX: hittade ingen motsvarande öppen nyckel - överhoppad\n"
 
 #: g10/trustdb.c:320
 #, fuzzy, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "Nyckeln har förbehållslöst förtroende.\n"
 
-# req är nog felstavat i originalet då det syftar på record och inte
-# request
+# req står för request
+# kollat med Werner. Per
 #: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "tillitspost %lu, posttyp %d: kunde inte läsa: %s\n"
+msgstr "tillitspost %lu, begäran av typ %d: kunde inte läsa: %s\n"
 
 #: g10/trustdb.c:350
 #, c-format
@@ -5800,89 +5865,124 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[spärrad]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[Giltighetstiden har gått ut]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "okänd"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "hittade inte den öppna nyckeln %08lX :%s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 
 # originalet borde ha ett value
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "Hittar inte den öppna nyckeln tillhörande den förbehållslöst betrodda "
 "nyckeln %08lX \n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -6004,7 +6104,7 @@ msgstr "fel vid skapande av fil"
 
 #: util/errors.c:79
 msgid "invalid passphrase"
-msgstr "felaktig lösenmening"
+msgstr "fel lösenmening"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
@@ -6192,26 +6292,13 @@ 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 "sorry, can't do this in batch mode\n"
-#~ msgstr "kan inte göra detta i batch-läge\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "hittade inte nyckeln  `%s': %s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "kan inte skapa \"%s\": %s\n"
-
-# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
-# fixa en patch?
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "Kan inte öppna fil %s\n"
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "sammandragsalgoritmen `%s' kan endast läsas i denna programutgåva\n"
 
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
-#~ "VARNING: sammandraget `%s' ingår inte i OpenPGP.  Användes på din egen "
+#~ "VARNING: sammandraget `%s' ingår inte i OpenPGP. Användes på din egen "
 #~ "risk!\n"
 
 #~ msgid "|[files]|encrypt files"
@@ -6230,7 +6317,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "signera en nyckel lokalt utan möjlighet till återkallelse"
 
 #~ msgid "list only the sequence of packets"
-#~ msgstr "skriv endast ut paketsekvensen"
+#~ msgstr "visa endast paketsekvensen"
 
 #~ msgid "export the ownertrust values"
 #~ msgstr "exportera de värden som representerar ägartillit"
@@ -6248,31 +6335,37 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "Skapa ett skal för en fil eller standard in"
 
 #~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|NAMN|använd NAMN som standardvärdet för mottagare"
+#~ msgstr "|NAMN|använd NAMN som förvald mottagare"
 
 #~ msgid "use the default key as default recipient"
-#~ msgstr "använd standardnyckeln som standardmottagare"
+#~ msgstr "använd standardnyckeln som förvald mottagare"
 
 #~ msgid "don't use the terminal at all"
 #~ msgstr "använd inte terminalen alls"
 
+# Alltså även för V4-nycklar. För att vara PGP-kompatibel.
 #~ msgid "force v3 signatures"
-#~ msgstr "använd v3-signaturer"
+#~ msgstr "använd alltid v3-signaturer"
 
+# motsatsen översatt med:
+# använd alltid v3-signaturer
 #~ msgid "do not force v3 signatures"
-#~ msgstr "använd inte v3-signaturer"
+#~ msgstr "genomdriv inte användning av v3-signaturer"
 
 #~ msgid "force v4 key signatures"
-#~ msgstr "använd v4-nyckelsignaturer"
+#~ msgstr "använd alltid v4-nyckelsignaturer"
 
 #~ msgid "do not force v4 key signatures"
-#~ msgstr "använd inte v4-nyckelsignaturer"
+#~ msgstr "genomdriv inte användning av v4-nyckelsignaturer"
 
+# Framtvingar användning av mdc även vid äldre chiffer. Ej kompatibelt med pgp.
+# Cast-5 används som standard  vid symmetrisk kryptering. Detta kommando integritetskyddar då den krypterade filen. Onödigt om nyare chiffer angivits med --personal-cipher-preferences
 #~ msgid "always use a MDC for encryption"
-#~ msgstr "använd alltid en MDC för kryptering"
+#~ msgstr "använd alltid en MDC vid kryptering"
 
+# mdc är standard för de nyare algoritmerna AES, TWOFISH
 #~ msgid "never use a MDC for encryption"
-#~ msgstr "använd aldrig en MDC för kryptering"
+#~ msgstr "använd aldrig en MDC vid kryptering"
 
 # syftar på ett användargränsnitt i ett separat program, till exempel gpa
 #~ msgid "use the gpg-agent"
@@ -6288,7 +6381,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "anta att svaret är nej på de flesta frågor"
 
 #~ msgid "add this keyring to the list of keyrings"
-#~ msgstr "lägg till denna nyckelring till listan av nyckelringar"
+#~ msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
 #~ msgid "add this secret keyring to the list"
 #~ msgstr "lägg till denna hemliga nyckelring till listan"
@@ -6306,7 +6399,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "|NAMN|sätt teckentabellen för terminalen till NAMN"
 
 #~ msgid "read options from file"
-#~ msgstr "läs flaggor från fil"
+#~ msgstr "läs inställningar från fil"
 
 #~ msgid "|[file]|write status info to file"
 #~ msgstr "|[fil]|skriv statusinformation till fil"
@@ -6322,13 +6415,13 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
 #~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
 #~ msgstr ""
-#~ "ändra inställningarna för paket, kryptering och kontrollsumma så att gpg "
-#~ "följer OpenPGP-standarden"
+#~ "ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma så "
+#~ "att gpg följer OpenPGP-standarden"
 
 #~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
 #~ msgstr ""
-#~ "ändra inställningarna för paket, kryptering och kontrollsumma så att gpg "
-#~ "härmar PGP 2.x-beteende"
+#~ "ändra inställningarna för paket, krypteringsalgoritm och kontrollsumma så "
+#~ "att gpg härmar PGP 2.x-beteende"
 
 #~ msgid "|N|use passphrase mode N"
 #~ msgstr "|N|använd lösenmeningsläget N"
@@ -6352,13 +6445,14 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "släng bort nyckelidentitetsfältet från krypterade paket"
 
 #~ msgid "Show Photo IDs"
-#~ msgstr "Visa fotoidentifikation"
+#~ msgstr "Visa foto-ID:n"
 
 #~ msgid "Don't show Photo IDs"
-#~ msgstr "Visa inte fotoidentifikation"
+#~ msgstr "Visa inte foto-ID:n"
 
+# Här anges alltså med vilket program som ska visa foto-ID:n
 #~ msgid "Set command line to view Photo IDs"
-#~ msgstr "Sätt komandoraden för att visa fotoientifikation"
+#~ msgstr "Ange kommandoraden för att visa foto-ID:n"
 
 #~ msgid "compress algorithm `%s' is read-only in this release\n"
 #~ msgstr ""
@@ -6382,7 +6476,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "nyckeln %08lX: en undernyckel har spärrats!\n"
 
 #~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: nyckeln har blivit för gammal\n"
+#~ msgstr "%08lX:giltighetstiden har gått ut för nyckeln\n"
 
 #~ msgid "%08lX: We do NOT trust this key\n"
 #~ msgstr "%08lX: Vi litar INTE på denna nyckel\n"
@@ -6400,6 +6494,48 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "   (%d) RSA (sign and encrypt)\n"
 #~ msgstr "   (%d) RSA (signering och kryptering)\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 ""
+#~ "Kommer att generera ett nytt %s nyckelpar.\n"
+#~ "              den minimala nyckelstorleken är  768 bitar\n"
+#~ "              den förvalda nyckelstorleken är 1024 bitar\n"
+#~ "    den största föreslagna nyckelstorleken är 2048 bitar\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA tillåter bara nyckelstorlekar från 512 till 1024\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "nyckelstorleken är för liten; 1024 är det minsta tillåtna värdet för "
+#~ "RSA.\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "nyckelstorleken är för liten; 768 är det minsta tillåtna värdet.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "nyckelstorleken är för stor; %d är det största tillåtna värdet\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Nyckelstorlekar större än 2048 är inte att rekommendera\n"
+#~ "eftersom beräkningar tar MYCKET lång tid!\n"
+
+#~ msgid "Are you sure that you want this keysize? "
+#~ msgstr "Är du säker på att du vill ha denna nyckelstorlek? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Ok, men kom ihåg att din bildskärm och ditt tangentbord också sänder\n"
+#~ "avslöjande strålning som kan avlyssnas!\n"
+
 #~ msgid "%s: can't open: %s\n"
 #~ msgstr "%s: kan inte öppna: %s\n"
 
@@ -6407,7 +6543,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "%s: VARNING: tom fil\n"
 
 #~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "hoppade över nyckeln %08lX - följer inte standarden RFC2440\n"
+#~ msgstr "hoppade över nyckeln %08lX - den följer inte standarden RFC2440\n"
 
 #~ msgid ""
 #~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
@@ -6420,7 +6556,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "%s%c %4u%c/%08lX  skapad: %s går ut: %s"
 
 #~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "revoked! en undernyckel har spärrats: %s\n"
+#~ msgstr "rev! undernyckeln har spärrats: %s\n"
 
 #~ msgid "rev- faked revocation found\n"
 #~ msgstr "rev- hittade förfalskad spärr av nyckeln\n"
@@ -6429,9 +6565,6 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? problem vid kontroll av spärren: %s\n"
 
-#~ msgid "[expired] "
-#~ msgstr "[Giltighetstiden har upphört]"
-
 #~ msgid ""
 #~ "\"\n"
 #~ "locally signed with your key %08lX at %s\n"
@@ -6446,12 +6579,21 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "  signerad av %08lX at %s%s\n"
 
 #~ msgid "Notation: "
-#~ msgstr "Notation: "
+#~ msgstr "Notering: "
 
 # finns det någon bra svensk översättning av policy?
 #~ msgid "Policy: "
 #~ msgstr "Policy: "
 
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Experimentella algoritmer bör inte användas!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "denna krypteringsalgoritm är föråldrad, använd istället en mer normal "
+#~ "algoritm!\n"
+
 #~ msgid "can't get key from keyserver: %s\n"
 #~ msgstr "kan inte hämta nyckeln från en nyckelserver: %s\n"
 
@@ -6468,7 +6610,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "Servern stöder inte sökning efter nycklar.\n"
 
 #~ msgid "can't search keyserver: %s\n"
-#~ msgstr "kan inte h?mta nyckeln fr?n en nyckelserver: %s\n"
+#~ msgstr "kan inte söka på nyckelservern: %s\n"
 
 #~ msgid ""
 #~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
@@ -6499,7 +6641,7 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgstr "%s: kan inte skapa lås\n"
 
 #~ msgid "%s: can't make lock\n"
-#~ msgstr "%s: kan inte skapa l?s\n"
+#~ msgstr "%s: kan inte skapa lås\n"
 
 #~ msgid "%s: can't create: %s\n"
 #~ msgstr "%s: kan inte skapa: %s\n"
@@ -6528,7 +6670,8 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
 #~ msgstr "Om du vill använda denna spärrade nyckel ändå, svara \"ja\"."
 
-# Ska inte avsnittet om ElGAmal -signaturer utgå!
+# Ska inte avsnittet om ElGAmal -signaturer utgå! Sådana signaturer knäcktes 2004.
+# Jo, enligt Werner ska avsnittet bort till nästa version.
 #~ msgid ""
 #~ "Select the algorithm to use.\n"
 #~ "\n"
@@ -6594,8 +6737,17 @@ msgstr "(du kan ha använt fel program för denna uppgift)\n"
 #~ msgid "key %08lX incomplete\n"
 #~ msgstr "nyckel %08lX är inte komplett\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "kan inte göra detta i batch-läge\n"
+
+# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
+# fixa en patch?
+#~ msgid "can't open file: %s\n"
+#~ msgstr "Kan inte öppna fil: %s\n"
+
+# Det ska vara ett kolon på denna plats, men det saknas!
 #~ msgid "error: missing colon\n"
-#~ msgstr "fel: saknar kolon\n"
+#~ msgstr "fel: kolonet saknas\n"
 
 #~ msgid "error: no ownertrust value\n"
 #~ msgstr "fel: förtroende för innehavaren (tillit) inte angivet\n"
diff --git a/po/tr.po b/po/tr.po
index 340f2c056..fccdb719e 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-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
@@ -16,11 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\n"
-
 #: cipher/primegen.c:120
 #, fuzzy, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -35,11 +30,12 @@ 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:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -72,9 +68,9 @@ 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/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "\"%s\" oluşturulamıyor: %s\n"
@@ -128,90 +124,150 @@ msgstr ""
 "daha fazla rasgele bayt toplayabilmesi için işletim sistemine\n"
 "yardımcı olun! (%d bayt daha gerekiyor)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, 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:547
+#: g10/app-openpgp.c:552
 #, 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:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, 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
+#, 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
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: serbest kaydı okuma hatası: %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' zaten sıkıştırılmış\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "yeni bir anahtar çifti üretir"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "anahtar bloğu silinemedi: %s\n"
+
+#: g10/app-openpgp.c:1141
+#, 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
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, 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:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -299,15 +355,15 @@ msgstr "gizli anahtar kullanışsız"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 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:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
@@ -315,143 +371,152 @@ msgstr "Seçiminiz? "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "işlenemedi"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "güncelenmiş tercihler"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "tercih dizgesindeki karakter geçersiz\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "hata: parmakizi geçersiz\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr " Parmak izi:"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "hata: parmakizi geçersiz\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, 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:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, 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:878
+#: g10/card-util.c:966
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -459,232 +524,256 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen istediğiniz anahtarı seçiniz:\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, 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:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, 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:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "k"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "bunu gösterir "
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "Anahtar burada: "
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "son kullanım tarihini değiştirir"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "parmak izini gösterir"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "genel hata"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Tekrar: "
+
+#: g10/cardglue.c:718
+#, 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:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -694,13 +783,13 @@ 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:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: 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:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -743,7 +832,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -762,7 +851,7 @@ msgstr "%s şifresi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -790,7 +879,7 @@ msgid ""
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -894,27 +983,27 @@ 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:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX anahtarı: korunmamış - atlandı\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, 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:361
+#: g10/export.c:384
 #, 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:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1093,15 +1182,15 @@ msgstr "hiçbir değişiklik yapmaz"
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1109,7 +1198,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1129,15 +1218,15 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Yazılım hatalarını lütfen <[email protected]> adresine bildirin.\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1147,7 +1236,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1155,460 +1244,460 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, 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:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, 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:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: %s \"%s\" için güvensiz iyelik\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: %s \"%s\" de güvensiz izinler\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, 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:1206
+#: g10/g10.c:1241
 #, 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:1209
+#: g10/g10.c:1244
 #, 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:1215
+#: g10/g10.c:1250
 #, 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:1218
+#: g10/g10.c:1253
 #, 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:1221
+#: g10/g10.c:1256
 #, 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:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "bilinmeyen yapılandırma öğesi \"%s\"\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, 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:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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:2048
+#: g10/g10.c:2079
 #, 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:2260
+#: 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:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:2285
+#: 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:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2295
+#: 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:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2305
+#: 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:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2315
+#: 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:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2340
+#: 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:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2350
+#: 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:2540
+#: 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:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 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:2583
+#: g10/g10.c:2616
 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:2589
+#: g10/g10.c:2622
 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:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, 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:2711
+#: g10/g10.c:2744
 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:2713
+#: g10/g10.c:2746
 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:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 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:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s henüz %s ile çalışmıyor\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, 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:2829
+#: g10/g10.c:2862
 #, 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:2834
+#: g10/g10.c:2867
 #, 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:2930
+#: g10/g10.c:2963
 #, 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:2941
+#: g10/g10.c:2974
 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:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, 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:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, 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:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key KULL-KML"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key KULL-KML"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh başarısız: %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1616,23 +1705,23 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
@@ -1641,30 +1730,30 @@ 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:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği bulunamadı]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, 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:2169
+#: g10/getkey.c:2189
 #, 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:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %08lX, asıl anahtar %08lX yerine kullanılıyor\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX anahtarı: genel anahtarsız gizli anahtar - atlandı\n"
@@ -2008,387 +2097,387 @@ msgstr "yardım mevcut değil"
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, 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:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %08lX: HKP yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, 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:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği geçersiz\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 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:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %08lX: genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %08lX: yeni anahtar - atlandı\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 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:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %08lX: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, 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:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, 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:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, 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:872
+#: g10/import.c:874
 #, 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:875
+#: g10/import.c:877
 #, 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:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %08lX: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %08lX: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %08lX: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %08lX: \"%s\" değişmedi\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, 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:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %08lX: gizli anahtar indirildi\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %08lX: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %08lX: gizli anahtar bulunamadı: %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, 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:1204
+#: g10/import.c:1206
 #, 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:1236
+#: g10/import.c:1238
 #, 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:1301
+#: g10/import.c:1303
 #, 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:1316
+#: g10/import.c:1318
 #, 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:1318
+#: g10/import.c:1320
 #, 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:1336
+#: g10/import.c:1338
 #, 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:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %08lX: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %08lX: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, 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:1386
+#: g10/import.c:1388
 #, 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:1399
+#: g10/import.c:1401
 #, 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:1414
+#: g10/import.c:1416
 #, 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:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %08lX: kullanıcı kimliği atlandı: '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %08lX: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, 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:1514
+#: g10/import.c:1516
 #, 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:1531
+#: g10/import.c:1533
 #, 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:1545
+#: g10/import.c:1547
 #, 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:1553
+#: g10/import.c:1555
 #, 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:1653
+#: g10/import.c:1655
 #, 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:1715
+#: g10/import.c:1717
 #, 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:1729
+#: g10/import.c:1731
 #, 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:1788
+#: g10/import.c:1790
 #, 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:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %08lX: doğrudan anahtar imzası eklendi\n"
@@ -2626,7 +2715,8 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (bilgi için '?' giriniz): "
 
 #: g10/keyedit.c:918
@@ -2698,7 +2788,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2729,7 +2819,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -3212,84 +3302,68 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, 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:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[yürürlükten kaldırıldı] "
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 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:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3297,7 +3371,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:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[yürürlükten kaldırıldı] "
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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"
@@ -3306,7 +3392,7 @@ msgstr ""
 "       başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
 "olabilir.\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3315,45 +3401,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:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 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:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3363,41 +3449,41 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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:2908
+#: g10/keyedit.c:2905
 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:2931
+#: g10/keyedit.c:2928
 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:2946
+#: g10/keyedit.c:2943
 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:2968
+#: g10/keyedit.c:2965
 #, 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:2987
+#: g10/keyedit.c:2984
 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:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3405,130 +3491,130 @@ msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 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:3113
+#: g10/keyedit.c:3110
 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:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, 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:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, 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:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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:3741
+#: g10/keyedit.c:3738
 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:3768
+#: g10/keyedit.c:3765
 #, 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:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, 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:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 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:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, 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:4129
+#: g10/keyedit.c:4126
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3572,12 +3658,12 @@ msgstr "öz-imza yazılıyor\n"
 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:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, 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:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -3645,91 +3731,60 @@ msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (sadece şifrelemek için)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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 ""
-"Yeni bir %s anahtar çifti üretmek üzeresiniz.\n"
-"                   en küçük anahtar uzunluğu:  768 bit\n"
-"                  öntanımlı anahtar uzunluğu: 1024 bit\n"
-"    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr ""
-"anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA anahtar çifti 1024 bit olacak.\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
-"2048 bitten fazlası tavsiye edilmez.\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (1024) "
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
-"Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
-"kendinizi uzak tutun! (ne demekse...)\n"
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "İstenen anahtar uzunluğu: %u bit\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3745,7 +3800,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3761,29 +3816,29 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "İmza ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s hep geçerli olacak\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s %s sonra geçersiz olacak\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3791,12 +3846,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:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/h)? "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3813,44 +3868,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 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:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3861,29 +3916,29 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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:1738
+#: g10/keygen.c:1750
 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:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3891,12 +3946,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3908,7 +3963,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3921,54 +3976,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA anahtar çifti 1024 bit olacak.\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, 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:2904
+#: g10/keygen.c:2916
 #, 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:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3976,19 +4027,19 @@ 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:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -3996,41 +4047,41 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 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:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "anahtar bloğu silinemedi: %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, 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:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4076,28 +4127,28 @@ msgstr "Anahtar Zinciri"
 msgid "expired: %s)"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4454,7 +4505,7 @@ msgstr "ikili"
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "bilinmeyen"
 
@@ -4485,29 +4536,42 @@ 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:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "\"core\" oluşumu iptal edilemedi: %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "dosya açılamadı: %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Deneysel algoritmalar kullanılmamalı!\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "%d genel anahtar algoritması kullanılamadı\n"
+
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "tamamlanmamış şifre algoritması"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
-"bu şifre algoritması standart dışı; lütfen daha standart birini kullanın!\n"
+"alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
+"isteniyor\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4618,50 +4682,50 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "istemci pid'i belirlenemiyor\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "sunucu okuma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "sunucu yazma dosya tanıtıcısı alınamadı\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4672,41 +4736,41 @@ 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:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "Parola çok uzun\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "yanıt geçersiz\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4716,19 +4780,19 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 "%u bitlik %s anahtarı, %08lX kimliği ile\n"
 "%s tarihinde üretilmiş"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
@@ -4935,7 +4999,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         Bu imza sahte anlamına gelebilir.\n"
 
 #: g10/pkclist.c:527
@@ -5039,28 +5104,28 @@ msgstr "geçerli adresler yok\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
@@ -5383,12 +5448,7 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "\"%s\"e yazıyor\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5396,40 +5456,40 @@ msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
 "isteniyor\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:186
+#: g10/skclist.c:185
 #, fuzzy
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
@@ -5618,12 +5678,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:134
+#: g10/textfilter.c:143
 #, 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:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "girdi satırı %d karakterden daha uzun\n"
@@ -5673,85 +5733,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[yürürlükten kaldırıldı] "
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[süresi doldu] "
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "bilinmeyen"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "%08lX genel anahtarı yok: %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %08lX genel anahtarı yok\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "güvence veritabanının %lu. kaydı, %d türünde: yazma başarısız: %s\n"
@@ -6062,6 +6157,65 @@ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "bu dağıtımda özümleme algoritması %s salt-okunurdur\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 ""
+#~ "Yeni bir %s anahtar çifti üretmek üzeresiniz.\n"
+#~ "                   en küçük anahtar uzunluğu:  768 bit\n"
+#~ "                  öntanımlı anahtar uzunluğu: 1024 bit\n"
+#~ "    önerilebilecek en büyük anahtar uzunluğu: 2048 bit\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA anahtarının uzunluğu 512 ile 1024 bit arasında olabilir\n"
+
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr ""
+#~ "anahtar uzunluğu çok küçük; RSA anahtarı için en küçük uzunluk: 1024 bit\n"
+
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr ""
+#~ "anahtar uzunluğu çok küçük; en küçük anahtar uzunluğu 768 bit'tir.\n"
+
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "anahtar uzunluğu çok büyük; izin verilen en büyük değer: %d bit\n"
+
+#~ msgid ""
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
+#~ msgstr ""
+#~ "Hesaplama EPEYCE UZUN zaman alacağından anahtar uzunluklarında\n"
+#~ "2048 bitten fazlası tavsiye edilmez.\n"
+
+#, fuzzy
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "Bu anahtar uzunluğunu istediğinizden emin misiniz? "
+
+#~ msgid ""
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
+#~ msgstr ""
+#~ "Tamam, ama saldırılara çok duyarlı olan monitör ve klavye ışınımlarından "
+#~ "kendinizi uzak tutun! (ne demekse...)\n"
+
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "Deneysel algoritmalar kullanılmamalı!\n"
+
+#~ msgid ""
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr ""
+#~ "bu şifre algoritması standart dışı; lütfen daha standart birini "
+#~ "kullanın!\n"
+
+#, fuzzy
+#~ msgid "writing to file `%s'\n"
+#~ msgstr "\"%s\"e yazıyor\n"
+
 #~ msgid "sorry, can't do this in batch mode\n"
 #~ msgstr "pardon, bu betik kipinde yapılamaz\n"
 
@@ -6194,12 +6348,6 @@ msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "yürkal? Yürürlükten kaldırma denetlenirken problem: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[yürürlükten kaldırıldı] "
-
-#~ msgid "[expired] "
-#~ msgstr "[süresi doldu] "
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr "[son kullanma tarihi: %s]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 74f778449..11449a5cf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,96 +1,92 @@
 # Simplified Chinese(zh-CN) messages for GnuPG
 # Copyright (C) 2002 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the gnupg package.
 # Meng Jie <[email protected]>, 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-10-28 10:59+0200\n"
-"PO-Revision-Date: 2004-07-20 15:50+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "��%s��ɢ���㷨�ڱ����а汾��ֻ��\n"
-
 #: cipher/primegen.c:120
-#, fuzzy, c-format
+#, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
-msgstr "�޷����ɶ��� %d λ������\n"
+msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n"
 
 #: cipher/primegen.c:311
 #, c-format
 msgid "can't generate a prime with less than %d bits\n"
-msgstr "�޷����ɶ��� %d λ������\n"
+msgstr "少于 %d 位时不能生成质数\n"
 
 #: cipher/random.c:163
 msgid "no entropy gathering module detected\n"
-msgstr "��ⲻ�������Ѽ�ģ��\n"
-
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+msgstr "检测不到熵数搜集模块\n"
+
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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 "�޷��򿪡�%s���� %s\n"
+msgstr "无法打开‘%s’： %s\n"
 
 #: cipher/random.c:391
 #, c-format
 msgid "can't stat `%s': %s\n"
-msgstr "�޷�����ļ���%s������Ϣ�� %s\n"
+msgstr "无法获得文件‘%s’的信息： %s\n"
 
 #: cipher/random.c:396
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
-msgstr "��%s������һ���Ϻ���׼���ļ������Ѻ���\n"
+msgstr "‘%s’不是一个合乎标准的文件――已忽略\n"
 
 #: cipher/random.c:401
 msgid "note: random_seed file is empty\n"
-msgstr "ע�⣺����������ļ�Ϊ��\n"
+msgstr "注意：随机数种子文件为空\n"
 
 #: cipher/random.c:407
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "���棺����������ļ���С��Ч����δʹ��\n"
+msgstr "警告：随机数种子文件大小无效――未使用\n"
 
 #: cipher/random.c:415
 #, c-format
 msgid "can't read `%s': %s\n"
-msgstr "�޷���ȡ��%s����%s\n"
+msgstr "无法读取‘%s’：%s\n"
 
 #: cipher/random.c:453
 msgid "note: random_seed file not updated\n"
-msgstr "ע�⣺����������ļ�δ������\n"
+msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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 "�޷�������%s����%s\n"
+msgstr "无法建立‘%s’：%s\n"
 
 #: cipher/random.c:480
 #, c-format
 msgid "can't write `%s': %s\n"
-msgstr "�޷�д�롮%s����%s\n"
+msgstr "无法写入‘%s’：%s\n"
 
 #: cipher/random.c:483
 #, c-format
 msgid "can't close `%s': %s\n"
-msgstr "�޷��رա�%s����%s\n"
+msgstr "无法关闭‘%s’：%s\n"
 
 #: cipher/random.c:728
 msgid "WARNING: using insecure random number generator!!\n"
-msgstr "���棺����ʹ�ò���ȫ�����������������\n"
+msgstr "警告：正在使用不安全的随机数发生器！！\n"
 
 #: cipher/random.c:729
 msgid ""
@@ -100,10 +96,10 @@ msgid ""
 "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n"
 "\n"
 msgstr ""
-"���������ַ������������Ǵ��ӻ⩤��\n"
-"�������Ͳ���ǿ�������������������\n"
+"这个随机数字发生器根本就是大杂烩──它根本就不是强有\n"
+"力的随机数发生器！\n"
 "\n"
-"*���Բ�Ҫʹ���������������κ����ݣ���\n"
+"绝对不要使用这个程序产生的任何数据！！\n"
 "\n"
 
 #: cipher/rndegd.c:204
@@ -112,8 +108,8 @@ msgid ""
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
-"���Դ�Ƭ�̣�ϵͳ��ʱ�����Ѽ��������������������ĵĻ���\n"
-"������Щ����£�ʵ�����������ܹ���������Ʒ�ʸ��á�\n"
+"请稍待片刻，系统此时正在搜集熵数。如果您会觉得无聊的话，不妨做些\n"
+"别的事，实际上这甚至能够让熵数的品质更好。\n"
 
 #: cipher/rndlinux.c:134
 #, c-format
@@ -123,915 +119,965 @@ msgid ""
 "the OS a chance to collect more entropy! (Need %d more bytes)\n"
 msgstr ""
 "\n"
-"����ֽڲ����ࡣ������һЩ���������£�\n"
-"��ʹ�ò���ϵͳ���Ѽ��������������(����Ҫ%d�ֽ�)\n"
+"随机字节不够多。请再做一些其他的琐事，以使操作系统能搜集到更多的熵数！\n"
+"(还需要%d字节)\n"
 
-#: g10/app-openpgp.c:534
-#, fuzzy, c-format
+#: g10/app-openpgp.c:539
+#, c-format
 msgid "failed to store the fingerprint: %s\n"
-msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
+msgstr "无法存储指纹：%s\n"
 
-#: g10/app-openpgp.c:547
-#, fuzzy, c-format
+#: g10/app-openpgp.c:552
+#, c-format
 msgid "failed to store the creation date: %s\n"
-msgstr "���½���Կ�׻�����ʧ�ܣ� %s\n"
+msgstr "无法存储创建日期：%s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
-msgstr ""
+msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, 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:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
-#, fuzzy, c-format
+#: 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
+#, c-format
 msgid "verify CHV%d failed: %s\n"
-msgstr "�޷����͵���Կ��������%s\n"
+msgstr "验证 CHV%d 失败：%s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
-msgstr ""
+msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
-msgstr ""
+msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
-msgstr ""
+msgstr "卡被永久锁定！\n"
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
-msgstr ""
+msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
-msgstr ""
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr "|A|管理员 PIN"
+
+#: g10/app-openpgp.c:1021
+#, fuzzy
+msgid "|AN|New Admin PIN"
+msgstr "|A|新的管理员 PIN"
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1021
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "新的 PIN"
+
+#: g10/app-openpgp.c:1025
 #, c-format
-msgid "PIN [sigs done: %lu]"
-msgstr ""
+msgid "error getting new PIN: %s\n"
+msgstr "获取新 PIN 时出错：%s\n"
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
-#, fuzzy, c-format
-msgid "can't access %s - invalid OpenPGP card?\n"
-msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+msgid "error reading application data\n"
+msgstr "读取应用程序数据时出错\n"
 
-#: g10/app-openpgp.c:1668
-#, fuzzy, c-format
-msgid "error getting serial number: %s\n"
-msgstr "���������ʱ��������%s\n"
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+msgid "error reading fingerprint DO\n"
+msgstr "读取指纹 D0 出错\n"
 
-#: g10/app-openpgp.c:1763
-#, fuzzy, c-format
-msgid "failed to store the key: %s\n"
-msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
+#: g10/app-openpgp.c:1107
+msgid "key already exists\n"
+msgstr "密钥已存在\n"
 
-#: g10/app-openpgp.c:1805
-#, fuzzy
-msgid "reading the key failed\n"
-msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr "现有的密钥将被替换\n"
 
-#: g10/app-openpgp.c:1812
+#: g10/app-openpgp.c:1113
+msgid "generating new key\n"
+msgstr "生成新密钥\n"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
+msgstr "请稍候，正在生成密钥……\n"
+
+#: g10/app-openpgp.c:1138
+msgid "generating key failed\n"
+msgstr "生成密钥失败\n"
+
+#: g10/app-openpgp.c:1141
+#, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "密钥已生成(耗时 %d 秒)\n"
+
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
 msgid "response does not contain the public key data\n"
-msgstr ""
+msgstr "响应未包含公钥数据\n"
 
-#: g10/app-openpgp.c:1820
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
 msgid "response does not contain the RSA modulus\n"
-msgstr ""
+msgstr "响应未包含 RSA 余数\n"
 
-#: g10/app-openpgp.c:1831
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
 msgid "response does not contain the RSA public exponent\n"
-msgstr ""
+msgstr "响应未包含 RSA 公共指数\n"
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr "目前已创建的签字：%lu\n"
+
+#: g10/app-openpgp.c:1367
+#, c-format
+msgid "PIN [sigs done: %lu]"
+msgstr "PIN [完成签字：%lu]"
+
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
+#, c-format
+msgid "can't access %s - invalid OpenPGP card?\n"
+msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
+
+#: g10/app-openpgp.c:1734
+#, c-format
+msgid "error getting serial number: %s\n"
+msgstr "取得序列号时出错：%s\n"
+
+#: g10/app-openpgp.c:1829
+#, c-format
+msgid "failed to store the key: %s\n"
+msgstr "无法存储密钥：%s\n"
+
+#: g10/app-openpgp.c:1871
+msgid "reading the key failed\n"
+msgstr "无法读出密钥\n"
 
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
-msgstr "ASCII ��װ��%s\n"
+msgstr "ASCII 封装：%s\n"
 
 #: g10/armor.c:346
 msgid "invalid armor header: "
-msgstr "��Ч�� ASCII ��װͷ��"
+msgstr "无效的 ASCII 封装头："
 
 #: g10/armor.c:353
 msgid "armor header: "
-msgstr "ASCII ��װͷ��"
+msgstr "ASCII 封装头："
 
 #: g10/armor.c:364
 msgid "invalid clearsig header\n"
-msgstr "��Ч������ǩ��ͷ\n"
+msgstr "无效的明文签字头\n"
 
 #: g10/armor.c:416
 msgid "nested clear text signatures\n"
-msgstr "�������ǩ��\n"
+msgstr "多层明文签字\n"
 
 #: g10/armor.c:551
-#, fuzzy
 msgid "unexpected armor: "
-msgstr "��Ԥ�ڲ����� ASCII ��װ��"
+msgstr "与预期不符的 ASCII 封装："
 
 #: g10/armor.c:563
 msgid "invalid dash escaped line: "
-msgstr "��Ч�����ֺ������У�"
+msgstr "以连字符开头的行格式错误："
 
 #: g10/armor.c:715 g10/armor.c:1300
-#, fuzzy, c-format
+#, c-format
 msgid "invalid radix64 character %02X skipped\n"
-msgstr "������Ч�� 64 �����ַ� %02x\n"
+msgstr "跳过无效的 64 进制字符 %02x\n"
 
 #: g10/armor.c:758
 msgid "premature eof (no CRC)\n"
-msgstr "�ļ�����Ԥ�ڽ���(û�� CRC ����)\n"
+msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
 #: g10/armor.c:792
 msgid "premature eof (in CRC)\n"
-msgstr "�ļ�����Ԥ�ڽ���(CRC ����δ����)\n"
+msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
 #: g10/armor.c:800
 msgid "malformed CRC\n"
-msgstr "�쳣�� CRC\n"
+msgstr "异常的 CRC\n"
 
 #: g10/armor.c:804 g10/armor.c:1337
-#, fuzzy, c-format
+#, c-format
 msgid "CRC error; %06lX - %06lX\n"
-msgstr "CRC ����%06lx - %06lx\n"
+msgstr "CRC 错误：%06lx - %06lx\n"
 
 #: g10/armor.c:824
-#, fuzzy
 msgid "premature eof (in trailer)\n"
-msgstr "�ļ�����Ԥ�ڽ���(�ڽ�β��)\n"
+msgstr "文件先于预期结束(于结尾处)\n"
 
 #: g10/armor.c:828
 msgid "error in trailer line\n"
-msgstr "���������\n"
+msgstr "结尾行有问题\n"
 
 #: g10/armor.c:1115
 msgid "no valid OpenPGP data found.\n"
-msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
+msgstr "找不到有效的 OpenPGP 数据。\n"
 
 #: g10/armor.c:1120
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
-msgstr "��Ч�� ASCII ��װ��һ�г��� %d �ַ�\n"
+msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
 #: g10/armor.c:1124
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
-msgstr "��װ��������ϵĿɴ�ӡ�ַ�������������ȱ�ݵ��ż����������ɵ�\n"
+msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
 
 #: g10/card-util.c:58 g10/card-util.c:282
-#, fuzzy, c-format
+#, c-format
 msgid "OpenPGP card not available: %s\n"
-msgstr "˽Կ������"
+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:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
-#, fuzzy
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 msgid "can't do this in batch mode\n"
-msgstr "�ò����޷���������ģʽ�н���\n"
+msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
-msgstr "����ѡ�� "
+msgstr "您的选择？ "
 
 #: g10/card-util.c:194 g10/card-util.c:244
 msgid "[not set]"
-msgstr ""
+msgstr "[未设定]"
 
-#: g10/card-util.c:376
-#, fuzzy
+#: g10/card-util.c:378
 msgid "male"
-msgstr "enable"
+msgstr "男性"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "female"
-msgstr "enable"
+msgstr "女性"
 
-#: g10/card-util.c:377
-#, fuzzy
+#: g10/card-util.c:379
 msgid "unspecified"
-msgstr "δָ��ԭ��"
+msgstr "未定义"
 
-#: g10/card-util.c:396
-#, fuzzy
+#: g10/card-util.c:406
 msgid "not forced"
-msgstr "�����"
+msgstr "可选"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
-msgstr ""
+msgstr "必须"
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
-msgstr ""
+msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
-msgstr ""
+msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
-msgstr ""
+msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
-msgstr ""
+msgstr "卡持有人的姓："
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
-msgstr ""
+msgstr "卡持有人的名："
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
-msgstr ""
+msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:502
-#, fuzzy
+#: g10/card-util.c:521
 msgid "URL to retrieve public key: "
-msgstr "û�����Ӧ�Ĺ�Կ��%s\n"
+msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
-msgstr ""
+msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
-msgstr "��ȡ��%s��ʱ������%s\n"
+msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
-msgstr ""
+msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
+msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
+
+#: g10/card-util.c:699
+msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:641
-#, fuzzy
+#: g10/card-util.c:709
+#, fuzzy, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr "错误：URL 太长(至多 %d 个字符)\n"
+
+#: g10/card-util.c:729
 msgid "Language preferences: "
-msgstr "���¹�����ѡ��"
+msgstr "首选语言："
 
-#: g10/card-util.c:649
-#, fuzzy
+#: g10/card-util.c:737
 msgid "Error: invalid length of preference string.\n"
-msgstr "��ѡ���ַ���������Ч���ַ�\n"
+msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:658
-#, fuzzy
+#: g10/card-util.c:746
 msgid "Error: invalid characters in preference string.\n"
-msgstr "��ѡ���ַ���������Ч���ַ�\n"
+msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
-msgstr ""
+msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:693
-#, fuzzy
+#: g10/card-util.c:781
 msgid "Error: invalid response.\n"
-msgstr "������Ч��ָ��\n"
+msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:714
-#, fuzzy
+#: g10/card-util.c:802
 msgid "CA fingerprint: "
-msgstr "��ʾָ��"
+msgstr "CA 指纹："
 
-#: g10/card-util.c:737
-#, fuzzy
+#: g10/card-util.c:825
 msgid "Error: invalid formatted fingerprint.\n"
-msgstr "������Ч��ָ��\n"
+msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:785
-#, fuzzy, c-format
+#: g10/card-util.c:873
+#, c-format
 msgid "key operation not possible: %s\n"
-msgstr "������Կʧ�ܣ�%s\n"
+msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:786
-#, fuzzy
+#: g10/card-util.c:874
 msgid "not an OpenPGP card"
-msgstr "�Ҳ�����Ч�� OpenPGP ���ݡ�\n"
+msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:795
-#, fuzzy, c-format
+#: g10/card-util.c:883
+#, c-format
 msgid "error getting current key info: %s\n"
-msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
+msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
-msgstr ""
+msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
-msgstr ""
+msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
-msgstr ""
+msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, 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’    管理员 PIN = ‘%s’\n"
+"您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:968
-#, fuzzy
+#: g10/card-util.c:1056
 msgid "Please select the type of key to generate:\n"
-msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
+msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
-#, fuzzy
+#: g10/card-util.c:1058 g10/card-util.c:1138
 msgid "   (1) Signature key\n"
-msgstr "���ǩ������ %s ���ڡ�\n"
+msgstr "  (1) 签字密钥\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
-#, fuzzy
+#: g10/card-util.c:1059 g10/card-util.c:1140
 msgid "   (2) Encryption key\n"
-msgstr "   (%d) RSA (�����ڼ���)\n"
+msgstr "  (1) 加密密钥\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
-msgstr ""
+msgstr "  (1) 认证密钥\n"
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
-msgstr "��Ч��ѡ��\n"
+msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1047
-#, fuzzy
+#: g10/card-util.c:1135
 msgid "Please select where to store the key:\n"
-msgstr "��ѡ�������ԭ��\n"
+msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1082
-#, fuzzy
+#: g10/card-util.c:1170
 msgid "unknown key protection algorithm\n"
-msgstr "δ֪�ı����㷨\n"
+msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1087
-#, fuzzy
+#: g10/card-util.c:1175
 msgid "secret parts of key are not available\n"
-msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
+msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1092
-#, fuzzy
+#: g10/card-util.c:1180
 msgid "secret key already stored on a card\n"
-msgstr "��������˽Կ�Ѵ���\n"
+msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
-msgstr "�뿪����˵�"
+msgstr "离开这个菜单"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
-msgstr ""
+msgstr "admin"
 
-#: g10/card-util.c:1164
-#, fuzzy
+#: g10/card-util.c:1252
 msgid "show admin commands"
-msgstr "��ͻ��ָ��\n"
+msgstr "显示管理员命令"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
-msgstr "��ʾ�������˵��"
+msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
-#, fuzzy
+#: g10/card-util.c:1255
 msgid "list all available data"
-msgstr "��Կ��ȡ�ԣ�"
+msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
-#, fuzzy
+#: g10/card-util.c:1258
 msgid "name"
-msgstr "enable"
+msgstr "name"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
-msgstr ""
+msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
-msgstr ""
+msgstr "url"
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
-msgstr ""
+msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
-msgstr ""
+msgstr "fetch"
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
-msgstr ""
+msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "login"
-msgstr "lsign"
+msgstr "login"
 
-#: g10/card-util.c:1174
-#, fuzzy
+#: g10/card-util.c:1262
 msgid "change the login name"
-msgstr "����ʹ������"
+msgstr "更改登录名"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
-msgstr ""
+msgstr "lang"
 
-#: g10/card-util.c:1175
-#, fuzzy
+#: g10/card-util.c:1263
 msgid "change the language preferences"
-msgstr "�������ζ�"
+msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
-msgstr ""
+msgstr "性别"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
-msgstr ""
+msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "cafpr"
-msgstr "fpr"
+msgstr "cafpr"
 
-#: g10/card-util.c:1177
-#, fuzzy
+#: g10/card-util.c:1265
 msgid "change a CA fingerprint"
-msgstr "��ʾָ��"
+msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1178
-#, fuzzy
+#: g10/card-util.c:1266
 msgid "forcesig"
-msgstr "revsig"
+msgstr "forcesig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
-msgstr ""
+msgstr "设定 PIN 签字是否必须"
 
-#: g10/card-util.c:1180
-#, fuzzy
+#: g10/card-util.c:1268
 msgid "generate"
-msgstr "�������"
+msgstr "generate"
 
-#: g10/card-util.c:1181
-#, fuzzy
+#: g10/card-util.c:1269
 msgid "generate new keys"
-msgstr "����һ���µ���Կ��"
+msgstr "生成新的密钥"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
+msgstr "更改或解锁 PIN 的菜单"
+
+#: g10/card-util.c:1272
+msgid "privatedo"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
-msgstr "����> "
+msgstr "命令> "
 
-#: g10/card-util.c:1281
-#, fuzzy
+#: g10/card-util.c:1371
 msgid "Admin-only command\n"
-msgstr "��ͻ��ָ��\n"
+msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1297
-#, fuzzy
+#: g10/card-util.c:1387
 msgid "Admin commands are allowed\n"
-msgstr "��ͻ��ָ��\n"
+msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1299
-#, fuzzy
+#: g10/card-util.c:1389
 msgid "Admin commands are not allowed\n"
-msgstr "���ڽ�˽Կд��`%s'\n"
+msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
-msgstr "��Ч��ָ��(���ԡ�help��)\n"
+msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
-msgstr ""
+msgstr "请插入卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, 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:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
-msgstr ""
+msgstr "就绪后请回车，或输入‘c’取消"
+
+#: g10/cardglue.c:687
+#, fuzzy
+msgid "Enter New Admin PIN: "
+msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "输入 PIN："
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
-msgstr ""
+msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
-msgstr ""
+msgstr "输入 PIN："
+
+#: g10/cardglue.c:704
+msgid "Repeat this PIN: "
+msgstr "再次输入此 PIN："
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:718
+msgid "PIN not correctly repeated; try again"
+msgstr "PIN 再次输入时与首次输入不符；请再试一次"
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 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 "�޷��򿪡�%s��\n"
+msgstr "无法打开‘%s’\n"
 
 #: g10/decrypt.c:104 g10/encode.c:859
 msgid "--output doesn't work for this command\n"
-msgstr "--output ����������������\n"
+msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found: %s\n"
-msgstr "�Ҳ�����%s����Կ��%s\n"
+msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
-msgstr "��ȡ��Կ����ʱ��������%s\n"
+msgstr "读取密钥区块时发生错误：%s\n"
 
 #: g10/delkey.c:121 g10/delkey.c:128
 msgid "(unless you specify the key by fingerprint)\n"
-msgstr "(��������ָ��ָ����Կ)\n"
+msgstr "(除非您用指纹指定密钥)\n"
 
 #: g10/delkey.c:127
-#, fuzzy
 msgid "can't do this in batch mode without \"--yes\"\n"
-msgstr "��������ģʽ�У�û�С�--yes�����޷���ô��\n"
+msgstr "在批处理模式中，没有“--yes”就无法这么做\n"
 
 #: g10/delkey.c:139
-#, fuzzy
 msgid "Delete this key from the keyring? (y/N) "
-msgstr "Ҫ��Կ�׻���ɾ�������Կ��"
+msgstr "要从钥匙环里删除这把密钥吗？(y/N)"
 
 #: g10/delkey.c:147
-#, fuzzy
 msgid "This is a secret key! - really delete? (y/N) "
-msgstr "����һ��˽Կ���������Ҫɾ����"
+msgstr "这是一把私钥！――真的要删除吗？(y/N)"
 
 #: g10/delkey.c:157
 #, c-format
 msgid "deleting keyblock failed: %s\n"
-msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
+msgstr "删除密钥区块时失败：%s\n"
 
 #: g10/delkey.c:167
 msgid "ownertrust information cleared\n"
-msgstr "���ζ���Ϣ�ѱ����\n"
+msgstr "信任度信息已被清除\n"
 
 #: g10/delkey.c:195
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
-msgstr "��Կ��%s���ж�Ӧ��˽Կ��\n"
+msgstr "公钥“%s”有对应的私钥！\n"
 
 #: g10/delkey.c:197
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
-msgstr "����ʹ�á�--delete-secret-keys��ѡ����ɾ������\n"
+msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
-msgstr "���������ʱ��������%s\n"
+msgstr "生成密码的时候发生错误：%s\n"
 
 #: g10/encode.c:215
 msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr "�ڴ� S2K ģʽ���޷�ʹ�öԳƵ� ESK ��\n"
+msgstr "在此 S2K 模式下无法使用对称的 ESK 包\n"
 
 #: g10/encode.c:228
 #, c-format
 msgid "using cipher %s\n"
-msgstr "ʹ�öԳƼ����㷨 %s\n"
+msgstr "使用对称加密算法 %s\n"
 
 #: g10/encode.c:238 g10/encode.c:558
 #, c-format
 msgid "`%s' already compressed\n"
-msgstr "��%s���ѱ�ѹ��\n"
+msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:551
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
-msgstr "���棺��%s����һ�����ļ�\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 "�� --pgp2 ģʽ�У���ֻ��ʹ�� 2048 �ֽڼ����µ� RSA ��Կ����\n"
+msgstr "在 --pgp2 模式中，您只能使用 2048 位及以下的 RSA 密钥加密\n"
 
 #: g10/encode.c:494
 #, c-format
 msgid "reading from `%s'\n"
-msgstr "���ڴӡ�%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 "����Ҫ�������ܵ�������Կ������ʹ�� IDEA �㷨��\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 "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\n"
+msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:648 g10/sign.c:876
-#, fuzzy, c-format
+#: g10/encode.c:648 g10/sign.c:877
+#, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
-msgstr "ǿ��ʹ�õ� %s (%d)ѹ���㷨�����ռ��ߵ���ѡ����\n"
+msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项中\n"
 
 #: g10/encode.c:735
 #, c-format
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
-msgstr "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\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 "�����ý� %s ���� %s ģʽ��\n"
+msgstr "您不该将 %s 用于 %s 模式中\n"
 
 #: g10/encode.c:832
 #, c-format
 msgid "%s/%s encrypted for: \"%s\"\n"
-msgstr "%s/%s �Ѿ����ܸ�����%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 ���ܹ�������\n"
+msgstr "%s 加密过的数据\n"
 
 #: g10/encr-data.c:68 g10/mainproc.c:305
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
-msgstr "��δ֪���㷨 %d ����\n"
+msgstr "以未知的算法 %d 加密\n"
 
 #: g10/encr-data.c:92
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
-msgstr "���棺���ı�ʹ�öԳƼ����㷨������Կ���ܡ�\n"
+msgstr "警告：报文被使用对称加密算法的弱密钥加密。\n"
 
 #: g10/encr-data.c:103
 msgid "problem handling encrypted packet\n"
-msgstr "�������ܰ�������\n"
+msgstr "处理加密包有问题\n"
 
 #: g10/exec.c:48
 msgid "no remote program execution supported\n"
-msgstr "��֧��Զ�̵���\n"
+msgstr "不支持远程调用\n"
 
 #: g10/exec.c:184 g10/openfile.c:406
 #, c-format
 msgid "can't create directory `%s': %s\n"
-msgstr "�޷�����Ŀ¼��%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 "���������ļ�Ȩ�޲���ȫ���ⲿ������ñ�����\n"
+msgstr "由于配置文件权限不安全，外部程序调用被禁用\n"
 
 #: g10/exec.c:355
-#, fuzzy
 msgid "this platform requires temporary files when calling external programs\n"
-msgstr "���������ƽ̨�ϵ����ⲿ����ʱ��Ҫ��ʱ�ļ�\n"
+msgstr "在这个操作平台上调用外部程序时需要临时文件\n"
 
 #: g10/exec.c:433
-#, fuzzy, c-format
+#, c-format
 msgid "unable to execute program `%s': %s\n"
-msgstr "�޷�ִ��%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 "�޷�ִ��%s��%s����%s\n"
+msgstr "无法在命令解释环境中执行‘%s’：%s\n"
 
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
-msgstr "�����ⲿ����ʱ����ϵͳ����%s\n"
+msgstr "调用外部程序时发生系统错误：%s\n"
 
 #: g10/exec.c:532 g10/exec.c:598
 msgid "unnatural exit of external program\n"
-msgstr "�ⲿ�����쳣�˳�\n"
+msgstr "外部程序异常退出\n"
 
 #: g10/exec.c:547
 msgid "unable to execute external program\n"
-msgstr "�޷�ִ���ⲿ����\n"
+msgstr "无法执行外部程序\n"
 
 #: g10/exec.c:563
 #, c-format
 msgid "unable to read external program response: %s\n"
-msgstr "�޷���ȡ�ⲿ������Ӧ��%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 "���棺�޷�ɾ����ʱ�ļ�(%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 "���棺�޷�ɾ����ʱĿ¼��%s����%s\n"
+msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:176
-#, fuzzy
+#: g10/export.c:182
 msgid "exporting secret keys not allowed\n"
-msgstr "���ڽ�˽Կд��`%s'\n"
+msgstr "不允许导出私钥\n"
 
-#: g10/export.c:206
-#, fuzzy, c-format
+#: g10/export.c:211
+#, c-format
 msgid "key %s: not protected - skipped\n"
-msgstr "��Կ %08lX��δ����������������\n"
+msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:214
-#, fuzzy, c-format
+#: g10/export.c:219
+#, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
-msgstr "��Կ %08lX��PGP 2.x ��ʽ����Կ����������\n"
+msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:361
-#, fuzzy, c-format
+#: g10/export.c:384
+#, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
-msgstr "���棺˽Կ %08lX �����ڼ�SK�����\n"
+msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
-msgstr "���棺û�е����κζ���\n"
+msgstr "警告：没有导出任何东西\n"
 
 #: g10/g10.c:358
 msgid ""
 "@Commands:\n"
 " "
 msgstr ""
-"@ָ�\n"
+"@指令：\n"
 " "
 
 #: g10/g10.c:360
 msgid "|[file]|make a signature"
-msgstr "|[�ļ���]|����һ��ǩ��"
+msgstr "|[文件名]|生成一份签字"
 
 #: g10/g10.c:361
 msgid "|[file]|make a clear text signature"
-msgstr "|[�ļ���]|����һ������ǩ��"
+msgstr "|[文件名]|生成一份明文签字"
 
 #: g10/g10.c:362
 msgid "make a detached signature"
-msgstr "����һ�ݷ����ǩ��"
+msgstr "生成一份分离的签字"
 
 #: g10/g10.c:363
 msgid "encrypt data"
-msgstr "��������"
+msgstr "加密数据"
 
 #: g10/g10.c:365
 msgid "encryption only with symmetric cipher"
-msgstr "��ʹ�öԳƼ���"
+msgstr "仅使用对称加密"
 
 #: g10/g10.c:367
 msgid "decrypt data (default)"
-msgstr "��������(Ĭ��)"
+msgstr "解密数据(默认)"
 
 #: g10/g10.c:369
 msgid "verify a signature"
-msgstr "��֤ǩ��"
+msgstr "验证签字"
 
 #: g10/g10.c:371
 msgid "list keys"
-msgstr "�г���Կ"
+msgstr "列出密钥"
 
 #: g10/g10.c:373
 msgid "list keys and signatures"
-msgstr "�г���Կ��ǩ��"
+msgstr "列出密钥和签字"
 
 #: g10/g10.c:374
-#, fuzzy
 msgid "list and check key signatures"
-msgstr "�����Կǩ��"
+msgstr "列出并检查密钥签字"
 
 #: g10/g10.c:375
 msgid "list keys and fingerprints"
-msgstr "�г���Կ��ָ��"
+msgstr "列出密钥和指纹"
 
 #: g10/g10.c:376
 msgid "list secret keys"
-msgstr "�г�˽Կ"
+msgstr "列出私钥"
 
 #: g10/g10.c:377
 msgid "generate a new key pair"
-msgstr "����һ���µ���Կ��"
+msgstr "生成一副新的密钥对"
 
 #: g10/g10.c:378
 msgid "remove keys from the public keyring"
-msgstr "�ӹ�ԿԿ�׻���ɾ����Կ"
+msgstr "从公钥钥匙环里删除密钥"
 
 #: g10/g10.c:380
 msgid "remove keys from the secret keyring"
-msgstr "��˽ԿԿ�׻���ɾ����Կ"
+msgstr "从私钥钥匙环里删除密钥"
 
 #: g10/g10.c:381
 msgid "sign a key"
-msgstr "Ϊij����Կ����ǩ��"
+msgstr "为某把密钥添加签字"
 
 #: g10/g10.c:382
 msgid "sign a key locally"
-msgstr "Ϊij����Կ���ӱ���ǩ��"
+msgstr "为某把密钥添加本地签字"
 
 #: g10/g10.c:385
 msgid "sign or edit a key"
-msgstr "�༭ij����Կ��Ϊ������ǩ��"
+msgstr "编辑某把密钥或为其添加签字"
 
 #: g10/g10.c:386
 msgid "generate a revocation certificate"
-msgstr "����һ�ݵ���֤��"
+msgstr "生成一份吊销证书"
 
 #: g10/g10.c:388
 msgid "export keys"
-msgstr "������Կ"
+msgstr "导出密钥"
 
 #: g10/g10.c:389
 msgid "export keys to a key server"
-msgstr "����Կ������ij����Կ��������"
+msgstr "把密钥导出到某个公钥服务器上"
 
 #: g10/g10.c:390
 msgid "import keys from a key server"
-msgstr "�ӹ�Կ�������ϵ�����Կ"
+msgstr "从公钥服务器上导入密钥"
 
 #: g10/g10.c:392
 msgid "search for keys on a key server"
-msgstr "�ڹ�Կ����������Ѱ��Կ"
+msgstr "在公钥服务器上搜寻密钥"
 
 #: g10/g10.c:394
 msgid "update all keys from a keyserver"
-msgstr "�ӹ�Կ�������������еı�����Կ"
+msgstr "从公钥服务器更新所有的本地密钥"
 
 #: g10/g10.c:397
 msgid "import/merge keys"
-msgstr "����/�ϲ���Կ"
+msgstr "导入/合并密钥"
 
 #: g10/g10.c:400
 msgid "print the card status"
-msgstr ""
+msgstr "打印卡状态"
 
 #: g10/g10.c:401
 msgid "change data on a card"
-msgstr ""
+msgstr "更改卡上的数据"
 
 #: g10/g10.c:402
 msgid "change a card's PIN"
-msgstr ""
+msgstr "更改卡的 PIN"
 
 #: g10/g10.c:410
 msgid "update the trust database"
-msgstr "�������ζ����ݿ�"
+msgstr "更新信任度数据库"
 
 #: g10/g10.c:417
 msgid "|algo [files]|print message digests"
-msgstr "|�㷨�� [�ļ���]|��ӡ����ɢ��ֵ��ʹ��ָ����ɢ���㷨"
+msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
 #: g10/g10.c:421 g10/gpgv.c:65
 msgid ""
@@ -1040,62 +1086,62 @@ msgid ""
 " "
 msgstr ""
 "@\n"
-"ѡ�\n"
+"选项：\n"
 " "
 
 #: g10/g10.c:423
 msgid "create ascii armored output"
-msgstr "����� ASCII ��װ"
+msgstr "输出经 ASCII 封装"
 
 #: g10/g10.c:425
 msgid "|NAME|encrypt for NAME"
-msgstr "|ij��|Ϊ�ռ��ߡ�ij�ס�����"
+msgstr "|某甲|为收件者“某甲”加密"
 
 #: g10/g10.c:436
 msgid "use this user-id to sign or decrypt"
-msgstr "ʹ������û���ʶ��ǩ�ֻ����"
+msgstr "使用这个用户标识来签字或解密"
 
 #: g10/g10.c:437
 msgid "|N|set compress level N (0 disables)"
-msgstr "|N|�趨ѹ���ȼ�Ϊ N(0 ��ʾ��ѹ��)"
+msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
 #: g10/g10.c:442
 msgid "use canonical text mode"
-msgstr "ʹ�ñ�׼���ı�ģʽ"
+msgstr "使用标准的文本模式"
 
 #: g10/g10.c:452
 msgid "use as output file"
-msgstr "ָ������ļ�"
+msgstr "指定输出文件"
 
 #: g10/g10.c:454 g10/gpgv.c:67
 msgid "verbose"
-msgstr "��ϸģʽ"
+msgstr "详细模式"
 
 #: g10/g10.c:465
 msgid "do not make any changes"
-msgstr "��Ҫ���κθı�"
+msgstr "不做任何改变"
 
 #: g10/g10.c:466
 msgid "prompt before overwriting"
-msgstr "����ǰ��ѯ��"
+msgstr "覆盖前先询问"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
-msgstr ""
+msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
-msgstr ""
+msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 "@\n"
-"(��ο�����˵���Ի�����������ѡ��������嵥)\n"
+"(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1107,575 +1153,567 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 "@\n"
-"������\n"
+"范例：\n"
 "\n"
-" -se -r Bob [�ļ���]          Ϊ Bob ����ռ���ǩ�ּ�����\n"
-" --clearsign [�ļ���]         ��������ǩ��\n"
-" --detach-sign [�ļ���]       ��������ʽǩ��\n"
-" --list-keys [ij��]           ��ʾ��Կ\n"
-" --fingerprint [ij��]         ��ʾָ��\n"
+" -se -r Bob [文件名]          为 Bob 这个收件人签字及加密\n"
+" --clearsign [文件名]         做出明文签字\n"
+" --detach-sign [文件名]       做出分离式签字\n"
+" --list-keys [某甲]           显示密钥\n"
+" --fingerprint [某甲]         显示指纹\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
-msgstr "���� <[email protected]> �������ȱ�ݡ�\n"
+msgstr ""
+"请向 <[email protected]> 报告程序缺陷。\n"
+"请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
-msgstr "�÷��� gpg [ѡ��] [�ļ�] (�� -h ����)"
+msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
 "default operation depends on the input data\n"
 msgstr ""
-"�﷨��gpg [ѡ��] [�ļ���]\n"
-"ǩ�֡���顢���ܻ����\n"
-"Ĭ�ϵIJ������������ݶ���\n"
+"语法：gpg [选项] [文件名]\n"
+"签字、检查、加密或解密\n"
+"默认的操作依输入数据而定\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 "\n"
-"֧�ֵ��㷨��\n"
+"支持的算法：\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
-msgstr "��Կ��"
+msgstr "公钥："
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
-msgstr "�ԳƼ��ܣ�"
+msgstr "对称加密："
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
-msgstr "ɢ�У�"
+msgstr "散列："
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
-msgstr "ѹ����"
+msgstr "压缩："
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
-msgstr "�÷���gpg [ѡ��] "
+msgstr "用法：gpg [选项] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
-msgstr "��ͻ��ָ��\n"
+msgstr "冲突的指令\n"
 
-#: g10/g10.c:982
-#, fuzzy, c-format
+#: g10/g10.c:1017
+#, c-format
 msgid "no = sign found in group definition `%s'\n"
-msgstr "�ڡ�%s���鶨�����Ҳ����Ⱥ�(=)\n"
+msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/g10.c:1179
-#, fuzzy, c-format
+#: g10/g10.c:1214
+#, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
-msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
+msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/g10.c:1182
-#, fuzzy, c-format
+#: g10/g10.c:1217
+#, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
-msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
+msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/g10.c:1185
-#, fuzzy, c-format
+#: g10/g10.c:1220
+#, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
-msgstr "���棺%s ������Ȩ����ȫ��%s��\n"
+msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/g10.c:1191
-#, fuzzy, c-format
+#: g10/g10.c:1226
+#, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
-msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
+msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/g10.c:1194
-#, fuzzy, c-format
+#: g10/g10.c:1229
+#, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
-msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
+msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/g10.c:1197
-#, fuzzy, c-format
+#: g10/g10.c:1232
+#, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
-msgstr "���棺%s ��Ȩ�޲���ȫ��%s��\n"
+msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/g10.c:1203
-#, fuzzy, c-format
+#: g10/g10.c:1238
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
-msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
+msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1206
-#, fuzzy, c-format
+#: g10/g10.c:1241
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
-msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
+msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1209
-#, fuzzy, c-format
+#: g10/g10.c:1244
+#, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
-msgstr "���棺%s �Ĺر�Ŀ¼����Ȩ����ȫ��%s��\n"
+msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1215
-#, fuzzy, c-format
+#: g10/g10.c:1250
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
-msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
+msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1218
-#, fuzzy, c-format
+#: g10/g10.c:1253
+#, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
-msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
+msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1221
-#, fuzzy, c-format
+#: g10/g10.c:1256
+#, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
-msgstr "���棺%s �Ĺر�Ŀ¼Ȩ�޲���ȫ��%s��\n"
+msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1362
-#, fuzzy, c-format
+#: g10/g10.c:1397
+#, c-format
 msgid "unknown configuration item `%s'\n"
-msgstr "δ֪�������%s��\n"
+msgstr "未知的配置项‘%s’\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
-msgstr "ע�⣺��ʽ��Ĭ�������ļ���%s���ѱ�����\n"
+msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
-msgstr "ע�⣺û��Ĭ�������ļ���%s��\n"
+msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
-msgstr "�����ļ���%s����%s\n"
+msgstr "配置文件‘%s’：%s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
-msgstr "�ӡ�%s����ȡѡ��\n"
+msgstr "从‘%s’读取选项\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 g10/g10.c:2584 g10/g10.c:2595
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
-msgstr "ע�⣺һ������²����õ� %s��\n"
+msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/g10.c:2048
-#, fuzzy, c-format
+#: g10/g10.c:2079
+#, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
-msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
+msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/g10.c:2260
-#, fuzzy, c-format
+#: g10/g10.c:2293
+#, c-format
 msgid "`%s' is not a valid character set\n"
-msgstr "%s ����һ����Ч���ַ���\n"
+msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
-#, fuzzy
+#: g10/g10.c:2312 g10/keyedit.c:3434
 msgid "could not parse keyserver URL\n"
-msgstr "�޷�������Կ������ URI\n"
+msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/g10.c:2285
-#, fuzzy, c-format
+#: g10/g10.c:2318
+#, c-format
 msgid "%s:%d: invalid keyserver options\n"
-msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/g10.c:2288
-#, fuzzy
+#: g10/g10.c:2321
 msgid "invalid keyserver options\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "无效的公钥服务器选项\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
-msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "无效的导入选项\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
-msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "无效的导出选项\n"
 
-#: g10/g10.c:2315
-#, fuzzy, c-format
+#: g10/g10.c:2348
+#, c-format
 msgid "%s:%d: invalid list options\n"
-msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/g10.c:2318
-#, fuzzy
+#: g10/g10.c:2351
 msgid "invalid list options\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "无效的列表选项\n"
 
-#: g10/g10.c:2340
-#, fuzzy, c-format
+#: g10/g10.c:2373
+#, c-format
 msgid "%s:%d: invalid verify options\n"
-msgstr "%s��%d����Ч�ĵ���ѡ��\n"
+msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/g10.c:2343
-#, fuzzy
+#: g10/g10.c:2376
 msgid "invalid verify options\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "无效的校验选项\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
-msgstr "�޷�������·����� %s\n"
+msgstr "无法把运行路径设成 %s\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
-msgstr "���棺������ܻᴴ�������ڴ�ת����\n"
+msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
-msgstr "���棺%s ��ʹ�� %s ʧЧ\n"
+msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
-msgstr "%s ������ %s ����\n"
+msgstr "%s 不可与 %s 并用\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
-msgstr "%s �� %s ���������壡\n"
+msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
-msgstr "��ֻ���� --pgp2 ģʽ�²���������ʽ������ǩ��\n"
+msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
-msgstr "���� --pgp2 ģʽ��ʱ������ͬʱǩ�ֺͼ���\n"
+msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
-msgstr "���� --pgp2 ʱ��Ӧ��ֻʹ���ļ������ǹܵ�\n"
+msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
-msgstr "�� --pgp2 ģʽ�¼��ܱ�����Ҫ IDEA �㷨\n"
+msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
-msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
+msgstr "所选的对称加密算法无效\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
-msgstr "��ѡ��ɢ���㷨��Ч\n"
+msgstr "所选的散列算法无效\n"
 
-#: g10/g10.c:2684
-#, fuzzy
+#: g10/g10.c:2717
 msgid "selected compression algorithm is invalid\n"
-msgstr "��ѡ�ĶԳƼ����㷨��Ч\n"
+msgstr "所选的压缩算法无效\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
-msgstr "��ѡ��֤��ɢ���㷨��Ч\n"
+msgstr "所选的证书散列算法无效\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
-msgstr "��Ҫ����ȫ����ǩ����һ��Ҫ���� 0\n"
+msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
-msgstr "��Ҫ����ǿ����ǩ����һ��Ҫ���� 1\n"
+msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/g10.c:2709
-#, fuzzy
+#: g10/g10.c:2742
 msgid "max-cert-depth must be in the range from 1 to 255\n"
-msgstr "�����֤���һ��Ҫ���� 1 �� 255 ֮��\n"
+msgstr "最大认证深度一定要介于 1 和 255 之间\n"
 
-#: g10/g10.c:2711
+#: g10/g10.c:2744
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
-msgstr "��Ч��Ĭ����֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
+msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/g10.c:2713
+#: g10/g10.c:2746
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
-msgstr "��Ч����С��֤��Σ�һ��Ҫ�� 0��1��2 �� 3\n"
+msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/g10.c:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
-msgstr "ע�⣺ǿ�Ҳ�����ʹ�ü򵥵� S2K ģʽ(0)\n"
+msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
-msgstr "��Ч�� S2K ģʽ�������� 0��1 �� 3\n"
+msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
-msgstr "��Ч��Ĭ����ѡ��\n"
+msgstr "无效的默认首选项\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
-msgstr "��Ч�ĸ��˶ԳƼ����㷨��ѡ��\n"
+msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
-msgstr "��Ч�ĸ���ɢ���㷨��ѡ��\n"
+msgstr "无效的个人散列算法首选项\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
-msgstr "��Ч�ĸ���ѹ���㷨��ѡ��\n"
+msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, c-format
 msgid "%s does not yet work with %s\n"
-msgstr "%s Ŀǰ�޷��� %s ����\n"
+msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/g10.c:2824
-#, fuzzy, c-format
+#: g10/g10.c:2857
+#, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
-msgstr "�����ý��ԳƼ����㷨��%s������ %s ģʽ��\n"
+msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/g10.c:2829
-#, fuzzy, c-format
+#: g10/g10.c:2862
+#, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
-msgstr "�����ý�ɢ���㷨��%s������ %s ģʽ��\n"
+msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/g10.c:2834
-#, fuzzy, c-format
+#: g10/g10.c:2867
+#, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
-msgstr "�����ý�ѹ���㷨��%s������ %s ģʽ��\n"
+msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
-msgstr "��ʼ�����ζ����ݿ�ʧ�ܣ�%s\n"
+msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
-msgstr "���棺�������ռ���(-r)����δʹ�ù�Կ����\n"
+msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
-msgstr "--store [�ļ���]"
+msgstr "--store [文件名]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
-msgstr "--symmetric [�ļ���]"
+msgstr "--symmetric [文件名]"
 
-#: g10/g10.c:2961
-#, fuzzy, c-format
+#: g10/g10.c:2994
+#, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
-msgstr "����ʧ�ܣ�%s\n"
+msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
-msgstr "--encrypt [�ļ���]"
+msgstr "--encrypt [文件名]"
 
-#: g10/g10.c:2984
-#, fuzzy
+#: g10/g10.c:3017
 msgid "--symmetric --encrypt [filename]"
-msgstr "--sign --encrypt [�ļ���]"
+msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:2989
-#, fuzzy, c-format
+#: g10/g10.c:3022
+#, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
-msgstr "�����ý� %s ���� %s ģʽ��\n"
+msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
-msgstr "--sign [�ļ���]"
+msgstr "--sign [文件名]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
-msgstr "--sign --encrypt [�ļ���]"
+msgstr "--sign --encrypt [文件名]"
 
-#: g10/g10.c:3035
-#, fuzzy
+#: g10/g10.c:3068
 msgid "--symmetric --sign --encrypt [filename]"
-msgstr "--sign --encrypt [�ļ���]"
+msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
-msgstr ""
+msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3040
-#, fuzzy, c-format
+#: g10/g10.c:3073
+#, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
-msgstr "�����ý� %s ���� %s ģʽ��\n"
+msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
-msgstr "--sign --symmetric [�ļ���]"
+msgstr "--sign --symmetric [文件名]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
-msgstr "--clearsign [�ļ���]"
+msgstr "--clearsign [文件名]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
-msgstr "--decrypt [�ļ���]"
+msgstr "--decrypt [文件名]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
-msgstr "--sign-key �û���ʶ"
+msgstr "--sign-key 用户标识"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
-msgstr "--lsign-key �û���ʶ"
+msgstr "--lsign-key 用户标识"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
-msgstr "--nrsign-key �û���ʶ"
+msgstr "--nrsign-key 用户标识"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
-msgstr "--nrlsign-key �û���ʶ"
+msgstr "--nrlsign-key 用户标识"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
-msgstr "--edit-key �û���ʶ [ָ��]"
+msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
-msgstr "-k[v][v][v][c] [�û���ʶ] [Կ�׻�]"
+msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, c-format
 msgid "keyserver send failed: %s\n"
-msgstr "�޷����͵���Կ��������%s\n"
+msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, c-format
 msgid "keyserver receive failed: %s\n"
-msgstr "�޷��ӹ�Կ���������գ�%s\n"
+msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, c-format
 msgid "key export failed: %s\n"
-msgstr "�޷�������Կ��%s\n"
+msgstr "导出密钥失败：%s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, c-format
 msgid "keyserver search failed: %s\n"
-msgstr "�޷��ڹ�Կ��������������%s\n"
+msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, c-format
 msgid "keyserver refresh failed: %s\n"
-msgstr "�޷��ӹ�Կ�������ϸ��£�%s\n"
+msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
-msgstr "�⿪ ASCII ��װʧ�ܣ�%s\n"
+msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
-msgstr "���� ASCII ��װʧ�ܣ�%s\n"
+msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
-msgstr "��Ч�ġ�%s��ɢ���㷨\n"
+msgstr "无效的‘%s’散列算法\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
-msgstr "[�ļ���]"
+msgstr "[文件名]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
-msgstr "�뿪ʼ�������ı��ġ���\n"
+msgstr "请开始键入您的报文……\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
-msgstr "������Ʊ���ֻ���пɴ�ӡ���ַ���ո񣬲���һ����=������β\n"
+msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
-msgstr "�û��������һ��Ҫ���С�@���ַ�\n"
+msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
-msgstr "���ֵһ������ʹ���κεĿ����ַ�\n"
+msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
-msgstr "�����ĵ���֤���� URL ��Ч\n"
+msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
-msgstr "������ǩ�ֲ��� URL ��Ч\n"
+msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/g10.c:3911
-#, fuzzy
+#: g10/g10.c:3944
 msgid "the given preferred keyserver URL is invalid\n"
-msgstr "������ǩ�ֲ��� URL ��Ч\n"
+msgstr "给定的首选公钥服务器 URL 无效\n"
 
 #: g10/getkey.c:150
 msgid "too many entries in pk cache - disabled\n"
-msgstr "pk ��������Ŀ̫�ࡪ���ѽ���\n"
+msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
-#, fuzzy
+#: g10/getkey.c:186 g10/getkey.c:2711
 msgid "[User ID not found]"
-msgstr "[�Ҳ����û���ʶ]"
+msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:1614
-#, fuzzy, c-format
+#: g10/getkey.c:1639
+#, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
-msgstr "--allow-non-selfsigned-uid ������Ч����Կ %08lX ��Ч\n"
+msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2169
-#, fuzzy, c-format
+#: g10/getkey.c:2189
+#, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
-msgstr "��Կ %08lX û�����Ӧ��˽Կ�������ں���\n"
+msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2400
-#, fuzzy, c-format
+#: g10/getkey.c:2420
+#, c-format
 msgid "using secondary key %s instead of primary key %s\n"
-msgstr "ʹ����Կ %08lX ������Կ %08lX\n"
+msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2447
-#, fuzzy, c-format
+#: g10/getkey.c:2467
+#, c-format
 msgid "key %s: secret key without public key - skipped\n"
-msgstr "��Կ %08lX��ֻ��˽Կ��û�й�Կ����������\n"
+msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
 #: g10/gpgv.c:68
 msgid "be somewhat more quiet"
-msgstr "����������ʾ��Ϣ"
+msgstr "尽量减少提示信息"
 
 #: g10/gpgv.c:69
 msgid "take the keys from this keyring"
-msgstr "�����Կ�׻���ȡ����Կ"
+msgstr "从这个钥匙环里取用密钥"
 
 #: g10/gpgv.c:71
 msgid "make timestamp conflicts only a warning"
-msgstr "��ʱ���ì�ܽ���Ϊ����"
+msgstr "把时间戳矛盾仅视为警告"
 
 #: g10/gpgv.c:72
 msgid "|FD|write status info to this FD"
-msgstr "|FD|��״̬��Ϣд���ļ������� FD"
+msgstr "|FD|把状态信息写入文件描述符 FD"
 
 #: g10/gpgv.c:96
 msgid "Usage: gpgv [options] [files] (-h for help)"
-msgstr "�÷���gpgv [ѡ��] [�ļ�] (�� -h ����)"
+msgstr "用法：gpgv [选项] [文件] (用 -h 求助)"
 
 #: g10/gpgv.c:99
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "Check signatures against known trusted keys\n"
 msgstr ""
-"�﷨��gpg [ѡ��] [�ļ�]\n"
-"����֪����������Կ�����ǩ��\n"
+"语法：gpg [选项] [文件]\n"
+"用已知的受信任密钥来检查签字\n"
 
 #: g10/helptext.c:48
 msgid ""
@@ -1683,8 +1721,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 ""
-"������ָ������ֵ��ȫ�����Լ���������Щ��ֵ��Զ���ᱻ������κε�������\n"
-"������Ҫ����ʵ�����ζ����磻�������������������֤�����޹ء�"
+"在这里指定的数值完全由您自己决定；这些数值永远不会被输出给任何第三方。\n"
+"我们需要它来实现“信任网络”；这跟隐含建立起来的“验证网络”无关。"
 
 #: g10/helptext.c:54
 msgid ""
@@ -1693,18 +1731,17 @@ msgid ""
 "access to the secret key.  Answer \"yes\" to set this key to\n"
 "ultimately trusted\n"
 msgstr ""
-"Ҫ�������������磬GnuPG ��Ҫ֪����Щ��Կ�ǿɾ������ε�\n"
-"����ͨ��������ӵ��˽Կ����Щ��Կ���ش�yes��������Щ\n"
-"��Կ��ɿɾ������ε�\n"
+"要建立起信任网络，GnuPG 需要知道哪些密钥是可绝对信任的――通常\n"
+"就是您拥有私钥的那些密钥。回答“yes”将此密钥设成可绝对信任的\n"
 
 #: g10/helptext.c:61
 msgid "If you want to use this untrusted key anyway, answer \"yes\"."
-msgstr "������������Ҫʹ�����δ�����ε���Կ����ش�yes����"
+msgstr "如果您无论如何要使用这把未被信任的密钥，请回答“yes”。"
 
 #: g10/helptext.c:65
 msgid ""
 "Enter the user ID of the addressee to whom you want to send the message."
-msgstr "������Ҫ���͵ı��ĵĽ����ߵ��û���ʶ��"
+msgstr "输入您要递送的报文的接收者的用户标识。"
 
 #: g10/helptext.c:69
 msgid ""
@@ -1719,6 +1756,15 @@ msgid ""
 "\n"
 "The first (primary) key must always be a key which is capable of signing."
 msgstr ""
+"选择使用的算法。\n"
+"\n"
+"DSA (也叫 DSS)即“数字签字算法”（美国国家标准），只能够用作签字。\n"
+"\n"
+"Elgamal 是一种只能用作加密的算法。\n"
+"\n"
+"RSA 可以用作签字或加密。\n"
+"\n"
+"第一把密钥(主钥)必须具有签字的能力。"
 
 #: g10/helptext.c:83
 msgid ""
@@ -1726,18 +1772,17 @@ msgid ""
 "encryption.  This algorithm should only be used in certain domains.\n"
 "Please consult your security expert first."
 msgstr ""
-"ͨ����˵��ͬһ����Կǩ�ּ����ܲ����Ǹ������⡣\n"
-"����㷨ֻ���ض��������ʹ�á�\n"
-"������ѯ��ȫ�����ר�ҡ�"
+"通常来说用同一把密钥签字及加密并不是个好主意。这个算法只在特定的情况\n"
+"下使用。请先咨询安全方面的专家。"
 
 #: g10/helptext.c:90
 msgid "Enter the size of the key"
-msgstr "��������Կ�ijߴ�"
+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 ""
@@ -1746,21 +1791,21 @@ msgid ""
 "get a good error response - instead the system tries to interpret\n"
 "the given value as an interval."
 msgstr ""
-"��������ʾ��Ҫ�����ֵ��\n"
-"���������� ISO ���ڸ�ʽ(YYYY-MM-DD)�����dz���ʱ������õ��Ѻõ���Ӧ����\n"
-"ϵͳ�᳢�Խ�����ֵ����Ϊʱ������"
+"请输入提示所要求的数值。\n"
+"您可以输入 ISO 日期格式(YYYY-MM-DD)，但是出错时您不会得到友好的响应――\n"
+"系统会尝试将给定值解释为时间间隔。"
 
 #: g10/helptext.c:116
 msgid "Enter the name of the key holder"
-msgstr "��������Կ�����˵�����"
+msgstr "请输入密钥持有人的名字"
 
 #: g10/helptext.c:121
 msgid "please enter an optional but highly suggested email address"
-msgstr "����������ʼ���ַ(��ѡ���ǿ���Ƽ�ʹ��)"
+msgstr "请输入电子邮件地址(可选项，但强烈推荐使用)"
 
 #: g10/helptext.c:125
 msgid "Please enter an optional comment"
-msgstr "������ע��(��ѡ��)"
+msgstr "请输入注释(可选项)"
 
 #: g10/helptext.c:130
 msgid ""
@@ -1770,15 +1815,15 @@ msgid ""
 "O  to continue with key generation.\n"
 "Q  to to quit the key generation."
 msgstr ""
-"N  �޸�������\n"
-"C  �޸�ע�͡�\n"
-"E  �޸ĵ����ʼ���ַ��\n"
-"O  ����������Կ��\n"
-"Q  ��ֹ������Կ��"
+"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 "���������������Կ����ش�yes��(���ߡ�y��)��"
+msgstr "如果您允许生成子钥，请回答“yes”(或者“y”)。"
 
 #: g10/helptext.c:147
 msgid ""
@@ -1820,51 +1865,43 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"����Ϊij����Կ��ij���û���ʶ����ǩ��ʱ��������������֤���\n"
-"��Կȷʵ���������������û���ʶ�ϵ��Ǹ��ˡ��˽⵽������ô��\n"
-"���ضԴ˽��й���֤�����������Ƿdz����õ�\n"
+"当您为某把密钥上某个用户标识添加签字时，您必须首先验证这把密钥确实属于\n"
+"署名于它的用户标识上的那个人。了解到您曾多么谨慎地对此进行过验证，对其\n"
+"他人是非常有用的\n"
 "\n"
-"��0�� ��ʾ����������κ��ض�������������\n"
-"    ������ϸ��֤�ǰ���Կ\n"
+"“0” 表示您对您有多么仔细地验证这把密钥的问题不表态。\n"
 "\n"
-"��1�� ��ʾ�����������Կ�����Ǹ����������˵��ˣ�\n"
-"    ���������ܻ����û����֤����\n"
-"    �����Щֻ��Ҫ�����ˡ���֤������˵�����ã�\n"
-"    ��Ϊ��Ϊһ����������ʹ���ߵ���Կǩ���֡�\n"
+"“1” 表示您相信这把密钥属于那个声明是主人的人，但是您不能或根本没有验\n"
+"      证过。如果您为一把属于类似虚拟人物的密钥签字，这个选择很有用。\n"
 "\n"
-"��2�� ��ʾ���������֤���ǰ���Կ��\n"
-"    ���磬����֤�������Կ��ָ�ƣ�\n"
-"    ��ȶ���Ƭ��֤���û���ʶ��\n"
+"“2” 表示您随意地验证了那把密钥。例如，您验证了这把密钥的指纹，或比对\n"
+"      照片验证了用户标识。\n"
 "\n"
-"��3�� ��ʾ�����˴����꾡����֤��Կ������\n"
-"    ����˵����ͬ��Կ��������֤����Կָ�ƣ�\n"
-"    ����ͨ�����鸽����Ƭ������α���֤��(�绤��)\n"
-"    ȷ������Կ�����˵���������Կ�ϵ��û���ʶһ�£�\n"
-"    �������(ͨ�������ʼ�����)��֤����Կ�ϵ�\n"
-"    �����ʼ���ַȷʵ������Կ�����ˡ�\n"
+"“3” 表示您做了大量而详尽的验证密钥工作。例如，您同密钥持有人验证了密\n"
+"      钥指纹，而且通过查验附带照片而难以伪造的证件(如护照)确认了密钥持\n"
+"      有人的姓名与密钥上的用户标识一致，最后您还(通过电子邮件往来)验证\n"
+"      了密钥上的电子邮件地址确实属于密钥持有人。\n"
 "\n"
-"��ע���������ڵȼ� 2 �� 3 ��˵���������Ӷ��ѡ�\n"
-"���ջ��ǵ������Լ���������Ϊ������Կǩ��ʱ��\n"
-"ʲô�ǡ����⡱����ʲô�ǡ��������꾡����\n"
+"请注意上述关于验证级别 2 和 3 的说明仅是例子而已。最终还是由您自己决定\n"
+"当您为其他密钥签字时，什么是“随意”，而什么是“大量而详尽”。\n"
 "\n"
-"�������֪��Ӧ��ѡʲô�𰸵Ļ�����ѡ��0����"
+"如果您不知道应该选什么答案的话，就选“0”。"
 
 #: g10/helptext.c:185
-#, fuzzy
 msgid "Answer \"yes\" if you want to sign ALL the user IDs"
-msgstr "�������ҪΪ�����û���ʶǩ�ֵĻ���ѡ��yes��"
+msgstr "如果您想要为所有用户标识签字的话就选“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 ""
-"����������Ҫɾ������û���ʶ�Ļ��ͻش�yes����\n"
-"���������֤�ڴ�֮��Ҳ�ᶪʧ��"
+"如果您真的想要删除这个用户标识的话就回答“yes”。\n"
+"所有相关认证在此之后也会丢失！"
 
 #: g10/helptext.c:194
 msgid "Answer \"yes\" if it is okay to delete the subkey"
-msgstr "�������ɾ�������Կ����ش�yes��"
+msgstr "如果可以删除这把子钥，请回答“yes”"
 
 #: g10/helptext.c:199
 msgid ""
@@ -1872,9 +1909,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 ""
-"����һ���������Կ����Ч��ǩ�֣�ͨ����������Ҫɾ�����ǩ�֣�\n"
-"��ΪҪ�������Կ��ӵ�������Կ��ǩ�ֵ���Կ������֤��ϵ����\n"
-"�൱��Ҫ��"
+"这是一份在这把密钥上有效的签字；通常您不会想要删除这份签字，\n"
+"因为要与这把密钥或拥有这把密钥的签字的密钥建立认证关系可能\n"
+"相当重要。"
 
 #: g10/helptext.c:204
 msgid ""
@@ -1883,15 +1920,15 @@ msgid ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"���ǩ���޷������飬��Ϊ��û����Ӧ����Կ����Ӧ���ݻ�ɾ������\n"
-"ֱ����֪����ǩ��ʹ������һ����Կ����Ϊ����ǩ�ֵ���Կ������\n"
-"�����Ѿ���֤����Կ������֤��ϵ��"
+"这份签字无法被检验，因为您没有相应的密钥。您应该暂缓删除它，\n"
+"直到您知道此签字使用了哪一把密钥；因为用来签字的密钥可能与\n"
+"其他已经验证的密钥存在信任关系。"
 
 #: g10/helptext.c:210
 msgid ""
 "The signature is not valid.  It does make sense to remove it from\n"
 "your keyring."
-msgstr "���ǩ����Ч��Ӧ������������Կ�׻���ɾ����"
+msgstr "这份签字无效。应当把它从您的钥匙环里删除。"
 
 #: g10/helptext.c:214
 msgid ""
@@ -1901,11 +1938,10 @@ msgid ""
 "only if this self-signature is for some reason not valid and\n"
 "a second one is available."
 msgstr ""
-"����һ�ݽ���Կ���û���ʶ����ϵ��ǩ�֡�ͨ����Ӧ\n"
-"ɾ��������ǩ�֡���ʵ�ϣ�һ��ɾ����GnuPG\n"
-"���ܴӴ˾Ͳ�����ʹ�������Կ�ˡ���ˣ�ֻ������\n"
-"����Կ�ĵ�һ������ǩ����ijЩԭ��ʧЧ�����еڶ�\n"
-"������ǩ�ֿ��õ�����²���ô����"
+"这是一份将密钥与用户标识相联系的签字。通常不应删除这样的签字。\n"
+"事实上，一旦删除，GnuPG可能从此就不能再使用这把密钥了。因此，\n"
+"只有在这把密钥的第一个自身签字因某些原因失效，而有第二个自身签\n"
+"字可用的情况下才这么做。"
 
 #: g10/helptext.c:222
 msgid ""
@@ -1913,32 +1949,32 @@ msgid ""
 "to the current list of preferences.  The timestamp of all affected\n"
 "self-signatures will be advanced by one second.\n"
 msgstr ""
-"�����е���ѡ���������(��ѡȡ��)�û���ʶ����ѡ�\n"
-"������Ӱ�������ǩ�ֵ�ʱ�����������һ���ӡ�\n"
+"用现有的首选项更新所有(或被选取的)用户标识的首选项。所有受影响的自身签\n"
+"字的时间戳都会增加一秒钟。\n"
 
 #: g10/helptext.c:229
 msgid "Please enter the passhrase; this is a secret sentence \n"
-msgstr "���������룺����һ�����ܵľ��� \n"
+msgstr "请输入密码：这是一个秘密的句子 \n"
 
 #: g10/helptext.c:235
 msgid "Please repeat the last passphrase, so you are sure what you typed in."
-msgstr "���ٴ������������룬��ȷ�������׼�����Щʲô��"
+msgstr "请再次输入上次的密码，以确定您到底键入了些什么。"
 
 #: g10/helptext.c:239
 msgid "Give the name of the file to which the signature applies"
-msgstr "�����Ҫ����ǩ�ֵ��ļ���"
+msgstr "请给定要添加签字的文件名"
 
 #: g10/helptext.c:244
 msgid "Answer \"yes\" if it is okay to overwrite the file"
-msgstr "������Ը�������ļ�����ش�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 ""
-"������һ���µ��ļ����������ֱ�Ӱ����˻س�����ô\n"
-"�ͻ�ʹ����ʾ�������е�Ĭ�ϵ��ļ�����"
+"请输入一个新的文件名。如果您直接按下了回车，那么就会使用显示在括\n"
+"号中的默认的文件名。"
 
 #: g10/helptext.c:255
 msgid ""
@@ -1955,18 +1991,17 @@ 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 ""
-"��Ӧ��Ϊ��ݵ���֤��ָ��һ��ԭ��\n"
-"�����龳�IJ�ͬ����Ӧ�ÿ��Դ�����嵥��ѡ��һ�\n"
-"  ����Կ��й©��\n"
-"      �����������ij��δ�����ɵ�����ȡ��������˽Կ��\n"
-"      ��ѡ���\n"
-"  ����Կ���滻��\n"
-"      ���������һ������Կ����ɵģ���ѡ���\n"
-"  ����Կ���ٱ�ʹ�á�\n"
-"      ������Ѿ����������Կ���ݣ���ѡ����\n"
-"  ���û���ʶ������Ч��\n"
-"      �������û���ʶ���ٱ�ʹ���ˣ���ѡ���\n"
-"      ��ͨ���ñ���ij�������ʼ���ַ�Ѳ�����Ч��\n"
+"您应该为这份吊销证书指定一个原因。根据情境的不同，您可以从下列清单中\n"
+"选出一项：\n"
+"  “密钥已泄漏”\n"
+"      如果您相信有某个未经许可的人已取得了您的私钥，请选此项。\n"
+"  “密钥已替换”\n"
+"      如果您已用一把新密钥代替旧的，请选此项。\n"
+"  “密钥不再被使用”\n"
+"      如果您已决定让这把密钥退休，请选此项\n"
+"  “用户标识不再有效”\n"
+"      如果这个用户标识不再被使用了，请选此项；这通常用表明某个电子邮\n"
+"      件地址已不再有效。\n"
 
 #: g10/helptext.c:271
 msgid ""
@@ -1974,475 +2009,472 @@ msgid ""
 "revocation certificate.  Please keep this text concise.\n"
 "An empty line ends the text.\n"
 msgstr ""
-"��Ҳ��������һ�����֣�����������ݵ���֤������ɡ�\n"
-"�뾡��ʹ������ּ�����Ҫ��\n"
-"����һ�����Խ������롣\n"
+"您也可以输入一串文字，描述发布这份吊销证书的理由。请尽量使这段文\n"
+"字简明扼要。\n"
+"键入一空行以结束输入。\n"
 
 #: g10/helptext.c:286
 msgid "No help available"
-msgstr "û�п��õİ���"
+msgstr "没有可用的帮助"
 
 #: g10/helptext.c:294
 #, c-format
 msgid "No help available for `%s'"
-msgstr "��%s��û�п��õİ���"
+msgstr "‘%s’没有可用的帮助"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
-msgstr "�������� %d ��ʽ������\n"
+msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:256
-#, fuzzy, c-format
+#: g10/import.c:258
+#, c-format
 msgid "%lu keys processed so far\n"
-msgstr "�Ѵ��� %lu ����Կ\n"
+msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
-msgstr "�ϼƱ�������������%lu\n"
+msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
-msgstr "  ������������Կ��%lu\n"
+msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
-msgstr "  ��ʧ���û���ʶ��%lu\n"
+msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
-msgstr "          �ѵ��룺%lu"
+msgstr "          已导入：%lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
-msgstr "          δ�ı䣺%lu\n"
+msgstr "          未改变：%lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
-msgstr "      ���û���ʶ��%lu\n"
+msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
-msgstr "        �µ���Կ��%lu\n"
+msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
-msgstr "        �µ�ǩ�֣�%lu\n"
+msgstr "        新的签字：%lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
-msgstr "    �µ���Կ������%lu\n"
+msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
-msgstr "      ��ȡ��˽Կ��%lu\n"
+msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
-msgstr "      �����˽Կ��%lu\n"
+msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
-msgstr "    δ�ı��˽Կ��%lu\n"
+msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
-msgstr "        δ�����룺%lu\n"
+msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
-msgstr ""
+msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n"
 
-#: g10/import.c:545
-#, fuzzy
+#: g10/import.c:547
 msgid "algorithms on these user IDs:\n"
-msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
+msgstr "算法：\n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
-msgstr ""
+msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:594
-#, fuzzy, c-format
+#: g10/import.c:596
+#, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
-msgstr "%sǩ�֣�ɢ���㷨 %s\n"
+msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
-msgstr ""
+msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
-msgstr ""
+msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
-msgstr ""
+msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, 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:693 g10/import.c:1047
-#, fuzzy, c-format
+#: g10/import.c:695 g10/import.c:1049
+#, c-format
 msgid "key %s: no user ID\n"
-msgstr "��Կ %08lX��û���û���ʶ\n"
+msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:713
-#, fuzzy, c-format
+#: g10/import.c:715
+#, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
-msgstr "��Կ %08lX������� HKP ��Կ�ѱ��޸�\n"
+msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:728
-#, fuzzy, c-format
+#: g10/import.c:730
+#, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
-msgstr "��Կ %08lX����������ǩ�ֵ��û���ʶ��%s���ѱ�����\n"
+msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
 
-#: g10/import.c:734
-#, fuzzy, c-format
+#: g10/import.c:736
+#, c-format
 msgid "key %s: no valid user IDs\n"
-msgstr "��Կ %08lX��û����Ч���û���ʶ\n"
+msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
-msgstr "���������ʧ����ǩ������\n"
+msgstr "这可能由于遗失自身签字所致\n"
 
-#: g10/import.c:746 g10/import.c:1168
-#, fuzzy, c-format
+#: g10/import.c:748 g10/import.c:1170
+#, c-format
 msgid "key %s: public key not found: %s\n"
-msgstr "��Կ %08lX���Ҳ�����Կ��%s\n"
+msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:752
-#, fuzzy, c-format
+#: g10/import.c:754
+#, c-format
 msgid "key %s: new key - skipped\n"
-msgstr "��Կ %08lX������Կ����������\n"
+msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
-msgstr "�Ҳ�����д��Կ�׻���%s\n"
+msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
-msgstr "����д�롮%s��\n"
+msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
-msgstr "д��Կ�׻���%s��ʱ������ %s\n"
+msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:791
-#, fuzzy, c-format
+#: g10/import.c:793
+#, c-format
 msgid "key %s: public key \"%s\" imported\n"
-msgstr "��Կ %08lX����Կ��%s���ѵ���\n"
+msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:815
-#, fuzzy, c-format
+#: g10/import.c:817
+#, c-format
 msgid "key %s: doesn't match our copy\n"
-msgstr "��Կ %08lX�������ǵĸ������Ǻ�\n"
+msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:832 g10/import.c:1186
-#, fuzzy, c-format
+#: g10/import.c:834 g10/import.c:1188
+#, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
-msgstr "��Կ %08lX���޷���λԭʼ����Կ���飺%s\n"
+msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:840 g10/import.c:1193
-#, fuzzy, c-format
+#: g10/import.c:842 g10/import.c:1195
+#, c-format
 msgid "key %s: can't read original keyblock: %s\n"
-msgstr "��Կ %08lX���޷���ȡԭʼ����Կ���飺 %s\n"
+msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:872
-#, fuzzy, c-format
+#: g10/import.c:874
+#, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
-msgstr "��Կ %08lX����%s��һ���µ��û���ʶ\n"
+msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:875
-#, fuzzy, c-format
+#: g10/import.c:877
+#, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
-msgstr "��Կ %08lX����%s��%d ���µ��û���ʶ\n"
+msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:878
-#, fuzzy, c-format
+#: g10/import.c:880
+#, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
-msgstr "��Կ %08lX����%s��1 ���µ�ǩ��\n"
+msgstr "密钥 %s：“%s”1 个新的签字\n"
 
-#: g10/import.c:881
-#, fuzzy, c-format
+#: g10/import.c:883
+#, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
-msgstr "��Կ %08lX����%s��%d ���µ�ǩ��\n"
+msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:884
-#, fuzzy, c-format
+#: g10/import.c:886
+#, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
-msgstr "��Կ %08lX����%s��1 ���µ���Կ\n"
+msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:887
-#, fuzzy, c-format
+#: g10/import.c:889
+#, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
-msgstr "��Կ %08lX����%s��%d ���µ���Կ\n"
+msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:908
-#, fuzzy, c-format
+#: g10/import.c:910
+#, c-format
 msgid "key %s: \"%s\" not changed\n"
-msgstr "��Կ %08lX����%s��û�б��ı�\n"
+msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1053
-#, fuzzy, c-format
+#: g10/import.c:1055
+#, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
-msgstr "��Կ %08lX��˽Կʹ������Ч�ļ����㷨 %d����������\n"
+msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1064
-#, fuzzy
+#: g10/import.c:1066
 msgid "importing secret keys not allowed\n"
-msgstr "���ڽ�˽Կд��`%s'\n"
+msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
-msgstr "û��Ĭ�ϵ�˽ԿԿ�׻��� %s\n"
+msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1092
-#, fuzzy, c-format
+#: g10/import.c:1094
+#, c-format
 msgid "key %s: secret key imported\n"
-msgstr "��Կ %08lX��˽Կ�ѵ���\n"
+msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1121
-#, fuzzy, c-format
+#: g10/import.c:1123
+#, c-format
 msgid "key %s: already in secret keyring\n"
-msgstr "��Կ %08lX������˽ԿԿ�׻�����\n"
+msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1131
-#, fuzzy, c-format
+#: g10/import.c:1133
+#, c-format
 msgid "key %s: secret key not found: %s\n"
-msgstr "��Կ %08lX���Ҳ���˽Կ��%s\n"
+msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1161
-#, fuzzy, c-format
+#: g10/import.c:1163
+#, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
-msgstr "��Կ %08lX��û�й�Կ�����޷�Ӧ�õ���֤��\n"
+msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1204
-#, fuzzy, c-format
+#: g10/import.c:1206
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
-msgstr "��Կ %08lX����Ч�ĵ���֤�飺%s�����ܾ�\n"
+msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1236
-#, fuzzy, c-format
+#: g10/import.c:1238
+#, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
-msgstr "��Կ %08lX����%s������֤���ѱ�����\n"
+msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1301
-#, fuzzy, c-format
+#: g10/import.c:1303
+#, c-format
 msgid "key %s: no user ID for signature\n"
-msgstr "��Կ %08lX��ǩ��û���û���ʶ\n"
+msgstr "密钥 %s：签字没有用户标识\n"
 
-#: g10/import.c:1316
-#, fuzzy, c-format
+#: g10/import.c:1318
+#, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
-msgstr "��Կ %08lX���û���ʶ��%s��ʹ���˲�֧�ֵĹ�Կ�㷨\n"
+msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1318
-#, fuzzy, c-format
+#: g10/import.c:1320
+#, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
-msgstr "��Կ %08lX���û���ʶ��%s������ǩ����Ч\n"
+msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
 
-#: g10/import.c:1336
-#, fuzzy, c-format
+#: g10/import.c:1338
+#, c-format
 msgid "key %s: no subkey for key binding\n"
-msgstr "��Կ %08lX��û�пɹ��󶨵���Կ\n"
+msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1347 g10/import.c:1397
-#, fuzzy, c-format
+#: g10/import.c:1349 g10/import.c:1399
+#, c-format
 msgid "key %s: unsupported public key algorithm\n"
-msgstr "��Կ %08lX����֧�ֵĹ�Կ�㷨\n"
+msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1349
-#, fuzzy, c-format
+#: g10/import.c:1351
+#, c-format
 msgid "key %s: invalid subkey binding\n"
-msgstr "��Կ %08lX����Ч����Կ��\n"
+msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1364
-#, fuzzy, c-format
+#: g10/import.c:1366
+#, c-format
 msgid "key %s: removed multiple subkey binding\n"
-msgstr "��Կ %08lX��������Կ���ѱ�ɾ��\n"
+msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1386
-#, fuzzy, c-format
+#: g10/import.c:1388
+#, c-format
 msgid "key %s: no subkey for key revocation\n"
-msgstr "��Կ %08lX��û��������Կ��������Կ\n"
+msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1399
-#, fuzzy, c-format
+#: g10/import.c:1401
+#, c-format
 msgid "key %s: invalid subkey revocation\n"
-msgstr "��Կ %08lX����Ч����Կ����\n"
+msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1414
-#, fuzzy, c-format
+#: g10/import.c:1416
+#, c-format
 msgid "key %s: removed multiple subkey revocation\n"
-msgstr "��Կ %08lX��������Կ������ɾ��\n"
+msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1456
-#, fuzzy, c-format
+#: g10/import.c:1458
+#, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
-msgstr "��Կ %08lX���������û���ʶ��"
+msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1477
-#, fuzzy, c-format
+#: g10/import.c:1479
+#, c-format
 msgid "key %s: skipped subkey\n"
-msgstr "��Կ %08lX����Կ������\n"
+msgstr "密钥 %s：已跳过子钥\n"
 
 #  here we violate the rfc a bit by still allowing
 #  * 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:1504
-#, fuzzy, c-format
+#: g10/import.c:1506
+#, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
-msgstr "��Կ %08lX�����ɵ�����ǩ��(�ȼ� %02x)����������\n"
+msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1514
-#, fuzzy, c-format
+#: g10/import.c:1516
+#, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
-msgstr "��Կ %08lX������֤��λ�ô��󡪡�������\n"
+msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1531
-#, fuzzy, c-format
+#: g10/import.c:1533
+#, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
-msgstr "��Կ %08lX����Ч�ĵ���֤�飺%s����������\n"
+msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1545
-#, fuzzy, c-format
+#: g10/import.c:1547
+#, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
-msgstr "��Կ %08lX����Կǩ��λ�ô��󡪡�������\n"
+msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
 
-#: g10/import.c:1553
-#, fuzzy, c-format
+#: g10/import.c:1555
+#, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
-msgstr "��Կ %08lX����Ԥ�ڲ�����ǩ�ֵȼ�(0x%02X)����������\n"
+msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1653
-#, fuzzy, c-format
+#: g10/import.c:1655
+#, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
-msgstr "��Կ %08lX����⵽�ظ����û���ʶ�����Ѻϲ�\n"
+msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1715
-#, fuzzy, c-format
+#: g10/import.c:1717
+#, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
-msgstr "���棺��Կ %08lX ���ܱ������ˣ�����ȡ�ص�����Կ %08lX\n"
+msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1729
-#, fuzzy, c-format
+#: g10/import.c:1731
+#, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
-msgstr "���棺��Կ %08lX ���ܱ������ˣ�������Կ %08lX �����ڡ�\n"
+msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1788
-#, fuzzy, c-format
+#: g10/import.c:1790
+#, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
-msgstr "��Կ %08lX������������֤�顰%s��\n"
+msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1822
-#, fuzzy, c-format
+#: g10/import.c:1824
+#, c-format
 msgid "key %s: direct key signature added\n"
-msgstr "��Կ %08lX��������ֱ����Կǩ��\n"
+msgstr "密钥 %s：已新增直接密钥签字\n"
 
 #: g10/keydb.c:167
 #, c-format
 msgid "error creating keyring `%s': %s\n"
-msgstr "����Կ�׻���%s��ʱ��������%s\n"
+msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
 #: g10/keydb.c:174
 #, c-format
 msgid "keyring `%s' created\n"
-msgstr "Կ�׻���%s���ѽ���\n"
+msgstr "钥匙环‘%s’已建立\n"
 
 #: g10/keydb.c:685
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
-msgstr "���½���Կ�׻�����ʧ�ܣ� %s\n"
+msgstr "重新建立钥匙环缓存失败： %s\n"
 
 #: g10/keyedit.c:253
 msgid "[revocation]"
-msgstr "[����]"
+msgstr "[吊销]"
 
 #: g10/keyedit.c:254
 msgid "[self-signature]"
-msgstr "[����ǩ��]"
+msgstr "[自身签字]"
 
 #: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
-msgstr "1 ���𻵵�ǩ��\n"
+msgstr "1 个损坏的签字\n"
 
 #: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
-msgstr "%d ���𻵵�ǩ��\n"
+msgstr "%d 个损坏的签字\n"
 
 #: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
-msgstr "�� 1 ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
+msgstr "有 1 份签字因为遗失密钥而未被检查\n"
 
 #: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
-msgstr "�� %d ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
+msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
 
 #: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
-msgstr "�� 1 ��ǩ����Ϊij�������δ�����\n"
+msgstr "有 1 份签字因为某个错误而未被检查\n"
 
 #: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
-msgstr "�� %d ��ǩ����ΪijЩ�����δ�����\n"
+msgstr "有 %d 份签字因为某些错误而未被检查\n"
 
 #: g10/keyedit.c:344
 msgid "1 user ID without valid self-signature detected\n"
-msgstr "��⵽ 1 ��û����Ч����ǩ�ֵ��û���ʶ\n"
+msgstr "检测到 1 个没有有效自身签字的用户标识\n"
 
 #: g10/keyedit.c:346
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
-msgstr "��⵽ %d ��û����Ч����ǩ�ֵ��û���ʶ\n"
+msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
 
 #: g10/keyedit.c:402 g10/pkclist.c:262
-#, fuzzy
 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 ""
-"������λ�û���֤�����û�����Կ(�������֤��\n"
-"ͨ����ͬ���������ָ�Ƶ�)�������ж������أ�\n"
-"\n"
+"您是否相信这位用户有能力验证其他用户密钥的有效性(查对身份证、通过不同的渠道检"
+"查\n"
+"指纹等)？\n"
 
 #: g10/keyedit.c:406 g10/pkclist.c:274
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust marginally\n"
-msgstr " %d = ����ǿ����\n"
+msgstr " %d = 我勉强相信\n"
 
 #: g10/keyedit.c:407 g10/pkclist.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust fully\n"
-msgstr " %d = ����ȫ����\n"
+msgstr " %d = 我完全相信\n"
 
 #: g10/keyedit.c:426
 msgid ""
@@ -2450,35 +2482,37 @@ msgid ""
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
+"请输入这份信任签字的深度。\n"
+"深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
 
 #: g10/keyedit.c:442
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
-msgstr ""
+msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
 
 #: g10/keyedit.c:584
 #, c-format
 msgid "User ID \"%s\" is revoked."
-msgstr "�û���ʶ��%s���ѱ�������"
+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:1486
 msgid "Are you sure you still want to sign it? (y/N) "
-msgstr "����Ȼ��ҪΪ��ǩ����(y/N)"
+msgstr "您仍然想要为它签字吗？(y/N)"
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
 #: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
-msgstr "  �޷�����ǩ�֡�\n"
+msgstr "  无法添加签字。\n"
 
 #: g10/keyedit.c:610
 #, c-format
 msgid "User ID \"%s\" is expired."
-msgstr "�û���ʶ��%s���ѹ��ڡ�"
+msgstr "用户标识“%s”已过期。"
 
 #: g10/keyedit.c:636
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
-msgstr "���棺�û���ʶ��%s����������ǩ�֡�"
+msgstr "警告：用户标识“%s”不含自身签字。"
 
 #: g10/keyedit.c:675
 #, c-format
@@ -2486,12 +2520,12 @@ msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
-"��%s���������ǩ��\n"
-"�� PGP 2.x ��ʽ��ǩ�֡�\n"
+"“%s”里的自身签字\n"
+"是 PGP 2.x 样式的签字。\n"
 
 #: g10/keyedit.c:684
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
-msgstr "���Ƿ���Ҫ���������� OpenPGP ������ǩ�֣�(y/N)"
+msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
 
 #: g10/keyedit.c:698
 #, c-format
@@ -2499,12 +2533,12 @@ msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
-"��ĿǰΪ��%s����ǩ��\n"
-"�Ѿ������ˡ�\n"
+"您目前为“%s”的签字\n"
+"已经过期了。\n"
 
 #: g10/keyedit.c:702
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
-msgstr "����Ҫ����һ���µ�ǩ����ȡ���ѹ��ڵ���һ����(y/N)"
+msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
 
 #: g10/keyedit.c:723
 #, c-format
@@ -2512,54 +2546,54 @@ msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
-"��Ŀǰ�ڡ�%s����ǩ��\n"
-"��һ�ݱ���ǩ�֡�\n"
+"您目前在“%s”的签字\n"
+"是一份本地签字。\n"
 
 #: g10/keyedit.c:727
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
-msgstr "���Ƿ���Ҫ���������ɿ�����ȫ������ǩ�֣�(y/N)"
+msgstr "您是否想要把他升级成可以完全导出的签字？(y/N)"
 
 #: g10/keyedit.c:748
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
-msgstr "��%s���Ѿ���Կ %08lX �ڱ���ǩ��\n"
+msgstr "“%s”已由密钥 %s 在本地签字\n"
 
 #: g10/keyedit.c:751
-#, fuzzy, c-format
+#, c-format
 msgid "\"%s\" was already signed by key %s\n"
-msgstr "��%s���Ѿ���Կ %08lX ǩ��\n"
+msgstr "“%s”已由密钥 %s 签字\n"
 
 #: g10/keyedit.c:756
 msgid "Do you want to sign it again anyway? (y/N) "
-msgstr "����Ȼ��ҪΪ���ٴ�ǩ����(y/N)"
+msgstr "您仍然想要为它再次签字吗？(y/N)"
 
 #: g10/keyedit.c:778
-#, fuzzy, c-format
+#, c-format
 msgid "Nothing to sign with key %s\n"
-msgstr "û�ж�����������Կ %08lX ǩ��\n"
+msgstr "没有东西可以让密钥 %s签字\n"
 
 #: g10/keyedit.c:793
 msgid "This key has expired!"
-msgstr "�����Կ�Ѿ����ڣ�"
+msgstr "这把密钥已经过期！"
 
 #: g10/keyedit.c:813
 #, c-format
 msgid "This key is due to expire on %s.\n"
-msgstr "�����Կ���� %s ���ڡ�\n"
+msgstr "这把密钥将在 %s 过期。\n"
 
 #: g10/keyedit.c:817
 msgid "Do you want your signature to expire at the same time? (Y/n) "
-msgstr "����Ҫ������ǩ��Ҳͬʱ������ (Y/n) "
+msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
 
 #: g10/keyedit.c:850
 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"
+msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签字。\n"
 
 #: g10/keyedit.c:852
 msgid "This would make the key unusable in PGP 2.x.\n"
-msgstr "����������Կ�� PGP 2.x ģʽ�²���ʹ�á�\n"
+msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
 #: g10/keyedit.c:877
 msgid ""
@@ -2567,154 +2601,129 @@ msgid ""
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
-"���ж�ô�����ؼ�����Ҫǩ�ֵ���Կ�Ƿ�ȷʵ�������������Ƶ��������أ�\n"
-"�������֪���������Ĵ𰸣������롰0����\n"
+"您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
+"如果您不知道这个问题的答案，请输入“0”。\n"
 
 #: g10/keyedit.c:882
 #, c-format
 msgid "   (0) I will not answer.%s\n"
-msgstr "   (0) �Ҳ����� %s\n"
+msgstr "   (0) 我不作答。 %s\n"
 
 #: g10/keyedit.c:884
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
-msgstr "   (1) �Ҹ���û�м����� %s\n"
+msgstr "   (1) 我根本没有检查过。 %s\n"
 
 #: g10/keyedit.c:886
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
-msgstr "   (2) ����������� %s\n"
+msgstr "   (2) 我随意检查过。 %s\n"
 
 #: g10/keyedit.c:888
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
-msgstr "   (3) �ҷdz�С�ĵؼ����� %s\n"
+msgstr "   (3) 我非常小心地检查过。 %s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
-msgstr "����ѡ��(���� ��?�� �Ի�ø������Ϣ)��"
+#, fuzzy
+msgid "Your selection? (enter `?' for more information): "
+msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
 #: g10/keyedit.c:918
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
-"�����ȷ��Ҫǩ�������Կ\n"
-"ʹ��������Կ��\""
+"您真的确定要签字这把密钥，使用您的密钥\n"
+"“%s”(%s)\n"
 
 #: g10/keyedit.c:925
-#, fuzzy
 msgid "This will be a self-signature.\n"
-msgstr ""
-"\n"
-"�⽫��������ǩ�֡�\n"
+msgstr "这将是一个自身签字。\n"
 
 #: g10/keyedit.c:931
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"���棺���ǩ�ֲ��ᱻ���Ϊ���ɵ�����\n"
+msgstr "警告：这份签字不会被标记为不可导出。\n"
 
 #: g10/keyedit.c:939
-#, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"���棺���ǩ�ֲ��ᱻ��dzɲ��ɵ�����\n"
+msgstr "警告：这份签字不会被标记成不可吊销。\n"
 
 #: g10/keyedit.c:949
-#, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
-msgstr ""
-"\n"
-"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
+msgstr "这份签字会被标记成不可导出。\n"
 
 #: g10/keyedit.c:956
-#, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
-msgstr ""
-"\n"
-"���ǩ�ֻᱻ��dzɲ��ɵ�����\n"
+msgstr "这份签字会被标记成不可吊销。\n"
 
 #: g10/keyedit.c:963
-#, fuzzy
 msgid "I have not checked this key at all.\n"
-msgstr ""
-"\n"
-"�Ҹ���û�м��������Կ��\n"
+msgstr "我根本没有检查过这把密钥。\n"
 
 #: g10/keyedit.c:968
-#, fuzzy
 msgid "I have checked this key casually.\n"
-msgstr ""
-"\n"
-"��������������Կ��\n"
+msgstr "我随意检查过这把密钥。\n"
 
 #: g10/keyedit.c:973
-#, fuzzy
 msgid "I have checked this key very carefully.\n"
-msgstr ""
-"\n"
-"�ҷdz�С�ĵؼ��������Կ��\n"
+msgstr "我非常小心地检查过这把密钥。\n"
 
 #: g10/keyedit.c:983
-#, fuzzy
 msgid "Really sign? (y/N) "
-msgstr "���Ҫǩ���� "
+msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
-msgstr "ǩ��ʱʧ�ܣ� %s\n"
+msgstr "签字时失败： %s\n"
 
 #: g10/keyedit.c:1084
 msgid "This key is not protected.\n"
-msgstr "�����Կû�б�������\n"
+msgstr "这把密钥没有被保护。\n"
 
 #: g10/keyedit.c:1088
 msgid "Secret parts of primary key are not available.\n"
-msgstr "��Կ��˽Կ�����޷�ȡ�á�\n"
+msgstr "主钥的私钥部分无法取用。\n"
 
 #: g10/keyedit.c:1092
 msgid "Key is protected.\n"
-msgstr "��Կ�������ˡ�\n"
+msgstr "密钥受保护。\n"
 
 #: g10/keyedit.c:1112
 #, c-format
 msgid "Can't edit this key: %s\n"
-msgstr "�޷��༭�����Կ�� %s\n"
+msgstr "无法编辑这把密钥： %s\n"
 
 #: g10/keyedit.c:1118
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
-"����Ҫ�����˽Կ�õ������롣\n"
+"输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
-msgstr "�����ٴ�����ʱ���״����벻����������һ��"
+msgstr "密码再次输入时与首次输入不符；请再试一次"
 
 #: g10/keyedit.c:1132
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
-"������Ҫ�����롪�������Ǹ������⣡\n"
+"您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
 #: g10/keyedit.c:1135
-#, fuzzy
 msgid "Do you really want to do this? (y/N) "
-msgstr "�������Ҫ��ô���� "
+msgstr "您真的想要这么做吗？(y/N)"
 
 #: g10/keyedit.c:1201
 msgid "moving a key signature to the correct place\n"
-msgstr "���ڰ���Կ��ǩ���ƶ�����ȷ��λ��ȥ\n"
+msgstr "正在把密钥的签字移动到正确的位置去\n"
 
 #: g10/keyedit.c:1247
 msgid "save"
@@ -2722,7 +2731,7 @@ msgstr "save"
 
 #: g10/keyedit.c:1247
 msgid "save and quit"
-msgstr "���沢�뿪"
+msgstr "保存并离开"
 
 #: g10/keyedit.c:1250
 msgid "fpr"
@@ -2730,11 +2739,11 @@ msgstr "fpr"
 
 #: g10/keyedit.c:1250
 msgid "show fingerprint"
-msgstr "��ʾָ��"
+msgstr "显示指纹"
 
 #: g10/keyedit.c:1251
 msgid "list key and user IDs"
-msgstr "�г���Կ���û���ʶ"
+msgstr "列出密钥和用户标识"
 
 #: g10/keyedit.c:1253
 msgid "uid"
@@ -2742,7 +2751,7 @@ msgstr "uid"
 
 #: g10/keyedit.c:1253
 msgid "select user ID N"
-msgstr "ѡ���û���ʶN"
+msgstr "选择用户标识 N"
 
 #: g10/keyedit.c:1254
 msgid "key"
@@ -2750,7 +2759,7 @@ msgstr "key"
 
 #: g10/keyedit.c:1254
 msgid "select secondary key N"
-msgstr "ѡ����Կ N"
+msgstr "选择子钥 N"
 
 #: g10/keyedit.c:1255
 msgid "check"
@@ -2758,7 +2767,7 @@ msgstr "check"
 
 #: g10/keyedit.c:1255
 msgid "list signatures"
-msgstr "�г�ǩ��"
+msgstr "列出签字"
 
 #: g10/keyedit.c:1256
 msgid "c"
@@ -2770,21 +2779,19 @@ msgstr "sign"
 
 #: g10/keyedit.c:1257
 msgid "sign the key"
-msgstr "Ϊ��Կ����ǩ��"
+msgstr "为密钥添加签字"
 
 #: g10/keyedit.c:1258
 msgid "s"
 msgstr "s"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "tsign"
-msgstr "sign"
+msgstr "tsign"
 
 #: g10/keyedit.c:1259
-#, fuzzy
 msgid "make a trust signature"
-msgstr "����һ�ݷ����ǩ��"
+msgstr "生成一份信任的签字"
 
 #: g10/keyedit.c:1260
 msgid "lsign"
@@ -2792,7 +2799,7 @@ msgstr "lsign"
 
 #: g10/keyedit.c:1260
 msgid "sign the key locally"
-msgstr "Ϊ��Կ���ӱ���ǩ��"
+msgstr "为密钥添加本地签字"
 
 #: g10/keyedit.c:1261
 msgid "nrsign"
@@ -2800,7 +2807,7 @@ msgstr "nrsign"
 
 #: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
-msgstr "Ϊ��Կ���Ӳ��ɵ���ǩ��"
+msgstr "为密钥添加不可吊销签字"
 
 #: g10/keyedit.c:1262
 msgid "nrlsign"
@@ -2808,7 +2815,7 @@ msgstr "nrlsign"
 
 #: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
-msgstr "Ϊ��Կ���Ӳ��ɵ����ı���ǩ��"
+msgstr "为密钥添加不可吊销的本地签字"
 
 #: g10/keyedit.c:1264
 msgid "adduid"
@@ -2816,7 +2823,7 @@ msgstr "adduid"
 
 #: g10/keyedit.c:1264
 msgid "add a user ID"
-msgstr "����һ���û���ʶ"
+msgstr "增加一个用户标识"
 
 #: g10/keyedit.c:1265
 msgid "addphoto"
@@ -2824,7 +2831,7 @@ msgstr "addphoto"
 
 #: g10/keyedit.c:1265
 msgid "add a photo ID"
-msgstr "����һ����Ƭ��ʶ"
+msgstr "增加一个照片标识"
 
 #: g10/keyedit.c:1266
 msgid "deluid"
@@ -2832,7 +2839,7 @@ msgstr "deluid"
 
 #: g10/keyedit.c:1266
 msgid "delete user ID"
-msgstr "ɾ��һ���û�/��Ƭ��ʶ"
+msgstr "删除一个用户/照片标识"
 
 #: g10/keyedit.c:1268
 msgid "delphoto"
@@ -2844,24 +2851,23 @@ msgstr "addkey"
 
 #: g10/keyedit.c:1269
 msgid "add a secondary key"
-msgstr "����һ����Կ"
+msgstr "增加一把子钥"
 
 #: g10/keyedit.c:1271
-#, fuzzy
 msgid "addcardkey"
-msgstr "addkey"
+msgstr "addcardkey"
 
 #: g10/keyedit.c:1271
 msgid "add a key to a smartcard"
-msgstr ""
+msgstr "在智能卡上添加一把密钥"
 
 #: g10/keyedit.c:1272
 msgid "keytocard"
-msgstr ""
+msgstr "卡密钥"
 
 #: g10/keyedit.c:1272
 msgid "move a key to a smartcard"
-msgstr ""
+msgstr "将一把密钥移动到智能卡上"
 
 #: g10/keyedit.c:1274
 msgid "delkey"
@@ -2869,7 +2875,7 @@ msgstr "delkey"
 
 #: g10/keyedit.c:1274
 msgid "delete a secondary key"
-msgstr "ɾ��һ����Կ"
+msgstr "删除一把子钥"
 
 #: g10/keyedit.c:1275
 msgid "addrevoker"
@@ -2877,7 +2883,7 @@ msgstr "addrevoker"
 
 #: g10/keyedit.c:1275
 msgid "add a revocation key"
-msgstr "����һ�ѵ�����Կ"
+msgstr "增加一把吊销密钥"
 
 #: g10/keyedit.c:1276
 msgid "delsig"
@@ -2885,7 +2891,7 @@ msgstr "delsig"
 
 #: g10/keyedit.c:1276
 msgid "delete signatures"
-msgstr "ɾ��ǩ��"
+msgstr "删除签字"
 
 #: g10/keyedit.c:1277
 msgid "expire"
@@ -2893,7 +2899,7 @@ msgstr "expire"
 
 #: g10/keyedit.c:1277
 msgid "change the expire date"
-msgstr "����ʹ������"
+msgstr "更改使用期限"
 
 #: g10/keyedit.c:1278
 msgid "primary"
@@ -2901,7 +2907,7 @@ msgstr "primary"
 
 #: g10/keyedit.c:1278
 msgid "flag user ID as primary"
-msgstr "�趨��ѡ�û���ʶ"
+msgstr "设定首选用户标识"
 
 #: g10/keyedit.c:1279
 msgid "toggle"
@@ -2909,7 +2915,7 @@ msgstr "toggle"
 
 #: g10/keyedit.c:1279
 msgid "toggle between secret and public key listing"
-msgstr "��˽Կ�͹�Կ�嵥���л�"
+msgstr "在私钥和公钥清单间切换"
 
 #: g10/keyedit.c:1281
 msgid "t"
@@ -2921,7 +2927,7 @@ msgstr "pref"
 
 #: g10/keyedit.c:1282
 msgid "list preferences (expert)"
-msgstr "�г���ѡ��(ר��ģʽ)"
+msgstr "列出首选项(专家模式)"
 
 #: g10/keyedit.c:1283
 msgid "showpref"
@@ -2929,7 +2935,7 @@ msgstr "showpref"
 
 #: g10/keyedit.c:1283
 msgid "list preferences (verbose)"
-msgstr "�г���ѡ��(��ϸģʽ)"
+msgstr "列出首选项(详细模式)"
 
 #: g10/keyedit.c:1284
 msgid "setpref"
@@ -2937,7 +2943,7 @@ msgstr "setpref"
 
 #: g10/keyedit.c:1284
 msgid "set preference list"
-msgstr "�趨��ѡ��"
+msgstr "设定首选项"
 
 #: g10/keyedit.c:1285
 msgid "updpref"
@@ -2945,21 +2951,19 @@ msgstr "updpref"
 
 #: g10/keyedit.c:1285
 msgid "updated preferences"
-msgstr "���¹�����ѡ��"
+msgstr "更新过的首选项"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "keyserver"
-msgstr "��Կ����������"
+msgstr "keyserver"
 
 #: g10/keyedit.c:1286
-#, fuzzy
 msgid "set preferred keyserver URL"
-msgstr "�޷�������Կ������ URI\n"
+msgstr "设定首选公钥服务器的 URL"
 
 #: g10/keyedit.c:1287
 msgid "change the passphrase"
-msgstr "��������"
+msgstr "更改密码"
 
 #: g10/keyedit.c:1288
 msgid "trust"
@@ -2967,7 +2971,7 @@ msgstr "trust"
 
 #: g10/keyedit.c:1288
 msgid "change the ownertrust"
-msgstr "�������ζ�"
+msgstr "更改信任度"
 
 #: g10/keyedit.c:1289
 msgid "revsig"
@@ -2975,7 +2979,7 @@ msgstr "revsig"
 
 #: g10/keyedit.c:1289
 msgid "revoke signatures"
-msgstr "����ǩ��"
+msgstr "吊销签字"
 
 #: g10/keyedit.c:1290
 msgid "revuid"
@@ -2983,7 +2987,7 @@ msgstr "revuid"
 
 #: g10/keyedit.c:1290
 msgid "revoke a user ID"
-msgstr "����һ���û���ʶ"
+msgstr "吊销一个用户标识"
 
 #: g10/keyedit.c:1291
 msgid "revkey"
@@ -2991,7 +2995,7 @@ msgstr "revkey"
 
 #: g10/keyedit.c:1291
 msgid "revoke a secondary key"
-msgstr "����һ����Կ"
+msgstr "吊销一把子钥"
 
 #: g10/keyedit.c:1292
 msgid "disable"
@@ -2999,7 +3003,7 @@ msgstr "disable"
 
 #: g10/keyedit.c:1292
 msgid "disable a key"
-msgstr "����һ����Կ"
+msgstr "禁用一把密钥"
 
 #: g10/keyedit.c:1293
 msgid "enable"
@@ -3007,7 +3011,7 @@ msgstr "enable"
 
 #: g10/keyedit.c:1293
 msgid "enable a key"
-msgstr "����һ����Կ"
+msgstr "启用一把密钥"
 
 #: g10/keyedit.c:1294
 msgid "showphoto"
@@ -3015,667 +3019,604 @@ msgstr "showphoto"
 
 #: g10/keyedit.c:1294
 msgid "show photo ID"
-msgstr "��ʾ��Ƭ��ʶ"
+msgstr "显示照片标识"
 
 #: g10/keyedit.c:1347
-#, fuzzy, c-format
+#, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
-msgstr "��ȡ��Կ���顮%s��ʱ������%s\n"
+msgstr "读取私钥区块“%s”时出错：%s\n"
 
 #: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
-msgstr "˽Կ���á�\n"
+msgstr "私钥可用。\n"
 
 #: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
-msgstr "Ҫ��˽Կ������ô����\n"
+msgstr "要有私钥才能这么做。\n"
 
 #: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
-msgstr "����ʹ�á�toggle��ָ�\n"
+msgstr "请先使用“toggle”指令。\n"
 
 #: g10/keyedit.c:1480
 msgid "Key is revoked."
-msgstr "��Կ�ѱ�������"
+msgstr "密钥已被吊销。"
 
 #: g10/keyedit.c:1500
-#, fuzzy
 msgid "Really sign all user IDs? (y/N) "
-msgstr "���Ϊ���е��û���ʶǩ���� "
+msgstr "真的为所有的用户标识签字吗？(y/N)"
 
 #: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
-msgstr "��ʾ��ѡ��Ҫ����ǩ�ֵ��û���ʶ\n"
+msgstr "提示：选择要添加签字的用户标识\n"
 
 #: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
-msgstr "�� %s ģʽ�в�����ʹ�����ָ�\n"
+msgstr "在 %s 模式中不允许使用这个指令。\n"
 
 #: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
-msgstr "�����ٵ�ѡ��һ���û���ʶ��\n"
+msgstr "您至少得选择一个用户标识。\n"
 
 #: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
-msgstr "������ɾ�����һ���û���ʶ��\n"
+msgstr "您不能删除最后一个用户标识！\n"
 
 #: g10/keyedit.c:1553
-#, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
-msgstr "���Ҫɾ�����б�ѡ����û���ʶ�� "
+msgstr "真的要删除所有被选择的用户标识吗？(y/N)"
 
 #: g10/keyedit.c:1554
-#, fuzzy
 msgid "Really remove this user ID? (y/N) "
-msgstr "���Ҫɾ������û���ʶ�� "
+msgstr "真的要删除这个用户标识吗？(y/N)"
 
 #: g10/keyedit.c:1604
-#, fuzzy
 msgid "Really move the primary key? (y/N) "
-msgstr "���Ҫɾ������û���ʶ�� "
+msgstr "真的要删除主钥吗？(y/N)"
 
 #: g10/keyedit.c:1616
-#, fuzzy
 msgid "You must select exactly one key.\n"
-msgstr "������ѡ������һ����Կ��\n"
+msgstr "您必须指定一把密钥。\n"
 
 #: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
-msgstr "������ѡ������һ����Կ��\n"
+msgstr "您必须选择至少一把密钥。\n"
 
 #: g10/keyedit.c:1639
-#, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
-msgstr "�������Ҫɾ����ѡ�����Կ�� "
+msgstr "您真的想要删除被选择的密钥吗？(y/N)"
 
 #: g10/keyedit.c:1640
-#, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
-msgstr "�����Ҫɾ�������Կ�� "
+msgstr "您真的要删除这把密钥吗？(y/N)"
 
 #: g10/keyedit.c:1675
-#, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
-msgstr "���Ҫ�������б�ѡ����û���ʶ�� "
+msgstr "真的要吊销所有被选择的用户标识吗？(y/N)"
 
 #: g10/keyedit.c:1676
-#, fuzzy
 msgid "Really revoke this user ID? (y/N) "
-msgstr "���Ҫ��������û���ʶ�� "
+msgstr "真的要吊销这个用户标识吗？(y/N)"
 
 #: g10/keyedit.c:1695
-#, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
-msgstr "�������Ҫ������Щ��ѡ�����Կ�� "
+msgstr "您真的想要吊销被选择的密钥吗？(y/N)"
 
 #: g10/keyedit.c:1696
-#, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
-msgstr "�������Ҫ���������Կ�� "
+msgstr "您真的想要吊销这把密钥吗？(y/N)"
 
 #: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
-msgstr ""
+msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
 #: g10/keyedit.c:1767
-#, fuzzy
 msgid "Set preference list to:\n"
-msgstr "�趨��ѡ��"
+msgstr "设为首选项列表为：\n"
 
 #: g10/keyedit.c:1773
-#, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
-msgstr "���Ҫ���±�ѡ���û���ʶ����ѡ���� "
+msgstr "真的要更新被选择用户标识的首选项吗？(y/N)"
 
 #: g10/keyedit.c:1775
-#, fuzzy
 msgid "Really update the preferences? (y/N) "
-msgstr "���Ҫ������ѡ���� "
+msgstr "真的要更新首选项吗？(y/N)"
 
 #: g10/keyedit.c:1825
-#, fuzzy
 msgid "Save changes? (y/N) "
-msgstr "Ҫ����䶯�� "
+msgstr "要保存变动吗？(y/N)"
 
 #: g10/keyedit.c:1828
-#, fuzzy
 msgid "Quit without saving? (y/N) "
-msgstr "Ҫ��������뿪�� "
+msgstr "要不保存而离开吗？(y/N)"
 
 #: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
-msgstr "����ʧ�ܣ�%s\n"
+msgstr "更新失败：%s\n"
 
 #: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
-msgstr "����˽Կʧ�ܣ�%s\n"
+msgstr "更新私钥失败：%s\n"
 
 #: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
-msgstr "��Կû�б䶯���Բ���Ҫ���¡�\n"
+msgstr "密钥没有变动所以不需要更新。\n"
 
 #: g10/keyedit.c:1924
 msgid "Digest: "
-msgstr "ɢ�У�"
+msgstr "散列："
 
 #: g10/keyedit.c:1976
 msgid "Features: "
-msgstr "�ص㣺"
+msgstr "特点："
 
 #: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
-msgstr ""
+msgstr "公钥服务器不可变造"
 
 #: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
-msgstr ""
+msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2245
 #, c-format
-msgid "This key may be revoked by %s key "
-msgstr "�����Կ�ɱ��� %s ��Կ������"
+msgid "This key may be revoked by %s key %s"
+msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
-msgstr " (���е�)"
+#: g10/keyedit.c:2251
+msgid "(sensitive)"
+msgstr " (敏感的)"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
-#, fuzzy, c-format
+#, c-format
 msgid "created: %s"
-msgstr "�޷����� %s��%s\n"
+msgstr "创建于：%s"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
-#, fuzzy, c-format
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
+#, c-format
 msgid "revoked: %s"
-msgstr "[�ѵ���]"
+msgstr "已吊销：%s"
 
-#  of subkey
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
-#, fuzzy, c-format
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
+#, c-format
 msgid "expired: %s"
-msgstr " [��������%s]"
+msgstr "已过期：%s"
 
-#  of subkey
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
+#, c-format
 msgid "expires: %s"
-msgstr " [��������%s]"
+msgstr "有效至：%s"
 
-#: g10/keyedit.c:2270
-#, fuzzy, c-format
+#: g10/keyedit.c:2276
+#, c-format
 msgid "usage: %s"
-msgstr " ���ζȣ� %c/%c"
+msgstr "可用于：%s"
 
-#: g10/keyedit.c:2285
-#, fuzzy, c-format
+#: g10/keyedit.c:2291
+#, c-format
 msgid "trust: %s"
-msgstr " ���ζȣ� %c/%c"
+msgstr "信任度：%s"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
-msgstr ""
+msgstr "有效性：%s"
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
-msgstr "�����Կ�Ѿ�������"
+msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[�ѵ���]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
+msgstr "卡号："
 
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
-msgstr "PGP 2.x ��ʽ���û���ʶû����ѡ�\n"
+msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
-msgstr ""
-"��ע�⣬������������֮ǰ��\n"
-"��ʾ����Կ��Ч��δ����ȷ��\n"
+msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
+
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+msgid "revoked"
+msgstr "已吊销"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+msgid "expired"
+msgstr "已过期"
+
+#: g10/keyedit.c:2536
 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"
-"      ���û���ʶ����ѡ�û���ʶ��\n"
+"警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:2599
+#: g10/keyedit.c:2596
 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 ""
-"���棺����һ�� PGP2 ��ʽ����Կ��\n"
-"      ������Ƭ��ʶ���ܻᵼ��ijЩ�汾�� PGP ����ʶ�������Կ��\n"
+"警告：这是一把 PGP2 样式的密钥。\n"
+"      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
-msgstr "��ȷ����Ȼ��Ҫ������(y/N)"
+msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
-msgstr "�������԰���Ƭ��ʶ���ӵ� PGP2 ��ʽ����Կ�\n"
+msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
-msgstr "ɾ�������õ�ǩ����(y/N/q)"
+msgstr "删除这个完好的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
-msgstr "ɾ�������Ч��ǩ����(y/N/q)"
+msgstr "删除这个无效的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
-msgstr "ɾ�����δ֪��ǩ����(y/N/q)"
+msgstr "删除这个未知的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
-msgstr "���Ҫɾ���������ǩ����(y/N)"
+msgstr "真的要删除这个自身签字吗？(y/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
-msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
+msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
-msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
+msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
-msgstr "û�ж�����ɾ����\n"
+msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 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 ""
-"���棺����һ�� PGP2 ��ʽ����Կ��\n"
-"     ����ָ�������߿��ܻᵼ��ijЩ�汾�� PGP �޷�ʶ�������Կ��\n"
+"警告：这是一把 PGP2 样式的密钥。\n"
+"     增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
-msgstr "��������Ϊ PGP 2.x ��ʽ����Կ����ָ�������ߡ�\n"
+msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
-msgstr "����ָ�������ߵ��û���ʶ��"
+msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
-msgstr "�޷��� PGP 2.x ��ʽ����Կ��Ϊָ��������\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:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
-msgstr "�����ܽ�ij����Կ��Ϊ���Լ���ָ��������\n"
+msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
-#: g10/keyedit.c:2968
-#, fuzzy
+#  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:2965
 msgid "this key has already been designated as a revoker\n"
-msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
+msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
-msgstr "���棺��ij����Կָ��Ϊָ�������ߵIJ����޷�������\n"
+msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:2993
-#, fuzzy
+#: g10/keyedit.c:2990
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
-msgstr "��ȷ��Ҫ�������Կ��Ϊָ����������(y/N)��"
+msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
-msgstr "���˽Կ��ɾ��ѡ��\n"
+msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
-msgstr "������ѡ��һ����Կ��\n"
+msgstr "请至多选择一把子钥。\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
-msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
+msgstr "正在变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
-msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
+msgstr "正在变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
-msgstr "�����ܱ��v3��Կ��ʹ������\n"
+msgstr "您不能变更v3密钥的使用期限\n"
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
-msgstr "��˽Կ����û��һ�µ�ǩ��\n"
+msgstr "在私钥环里没有一致的签字\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
-msgstr "�뾫ȷ��ѡ��һ���û���ʶ��\n"
+msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
-#, fuzzy, c-format
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
+#, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
-msgstr "���������û���ʶ��%s���� v3 ����ǩ��\n"
+msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
-msgstr ""
+msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:3498
-#, fuzzy
+#: g10/keyedit.c:3495
 msgid "Are you sure you want to replace it? (y/N) "
-msgstr "��ȷ��Ҫ������(y/N)"
+msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:3499
-#, fuzzy
+#: g10/keyedit.c:3496
 msgid "Are you sure you want to delete it? (y/N) "
-msgstr "��ȷ��Ҫ������(y/N)"
+msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "û������Ϊ %d ���û���ʶ\n"
+msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
-msgstr "û������Ϊ %d ����Կ\n"
+msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:3724
-#, fuzzy, c-format
+#: g10/keyedit.c:3721
+#, c-format
 msgid "user ID: \"%s\"\n"
-msgstr "�û���ʶ����"
+msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
-#, fuzzy, c-format
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
+#, c-format
 msgid "signed by your key %s on %s%s%s\n"
-msgstr "   �� %08lX �� %s%s%s ����ǩ��\n"
+msgstr "由您的密钥 %s 于 %s%s(%s) 签字\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
-msgstr " (���ɵ���)"
+msgstr " (不可导出)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
-msgstr "���ǩ������ %s ���ڡ�\n"
+msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 msgid "Are you sure you still want to revoke it? (y/N) "
-msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
+msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
-msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
+msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:3768
-#, fuzzy, c-format
+#: g10/keyedit.c:3765
+#, c-format
 msgid "You have signed these user IDs on key %s:\n"
-msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
+msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
 
-#: g10/keyedit.c:3794
-#, fuzzy
+#: g10/keyedit.c:3791
 msgid " (non-revocable)"
-msgstr " (���ɵ���)"
+msgstr " (不可吊销)"
 
-#: g10/keyedit.c:3801
-#, fuzzy, c-format
+#: g10/keyedit.c:3798
+#, c-format
 msgid "revoked by your key %s on %s\n"
-msgstr "   �� %08lX ������ %s\n"
+msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
-msgstr "�����ڵ�����Щǩ�֣�\n"
+msgstr "您正在吊销这些签字：\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
-msgstr "���Ҫ���ɵ���֤����(y/N)"
+msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
-msgstr "û��˽Կ\n"
+msgstr "没有私钥\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
-msgstr "�û���ʶ��%s���Ѿ���������\n"
+msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
-msgstr "���棺��һ���û���ʶǩ�ֵ����ڱ��Ϊ %d ����δ��\n"
+msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4129
-#, fuzzy, c-format
+#: g10/keyedit.c:4126
+#, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
-msgstr "������ʾ %s ��Ƭ��ʶ(��СΪ %ld��������Կ 0x%08lX���û���ʶ %d)\n"
+msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
 
 #: g10/keygen.c:293
-#, fuzzy, c-format
+#, c-format
 msgid "preference `%s' duplicated\n"
-msgstr "��ѡ�� %c%lu �ظ�\n"
+msgstr "首选项‘%s’重复\n"
 
 #: g10/keygen.c:300
-#, fuzzy
 msgid "too many cipher preferences\n"
-msgstr "̫����ѡ�%c��\n"
+msgstr "太多对称加密算法首选项\n"
 
 #: g10/keygen.c:302
-#, fuzzy
 msgid "too many digest preferences\n"
-msgstr "̫����ѡ�%c��\n"
+msgstr "太多散列算法首选项\n"
 
 #: g10/keygen.c:304
-#, fuzzy
 msgid "too many compression preferences\n"
-msgstr "̫����ѡ�%c��\n"
+msgstr "太多首选压缩算法\n"
 
 #: g10/keygen.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "invalid item `%s' in preference string\n"
-msgstr "��ѡ���ַ���������Ч���ַ�\n"
+msgstr "首选项字符串里有无效项‘%s’\n"
 
 #: g10/keygen.c:827
 msgid "writing direct signature\n"
-msgstr "����д��ֱ��ǩ��\n"
+msgstr "正在写入直接签字\n"
 
 #: g10/keygen.c:866
 msgid "writing self signature\n"
-msgstr "����д������ǩ��\n"
+msgstr "正在写入自身签字\n"
 
 #: g10/keygen.c:912
 msgid "writing key binding signature\n"
-msgstr "����д����Կ��ǩ��\n"
+msgstr "正在写入密钥绑定签字\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, c-format
 msgid "keysize invalid; using %u bits\n"
-msgstr "��Կ�ߴ���Ч������ %u �ֽ�\n"
+msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
-msgstr "��Կ�ߴ����뵽 %u �ֽ�\n"
+msgstr "密钥尺寸舍入到 %u 位\n"
 
 #: g10/keygen.c:1247
-#, fuzzy
 msgid "Sign"
-msgstr "sign"
+msgstr "签字"
 
 #: g10/keygen.c:1250
-#, fuzzy
 msgid "Encrypt"
-msgstr "��������"
+msgstr "加密"
 
 #: g10/keygen.c:1253
 msgid "Authenticate"
-msgstr ""
+msgstr "认证"
 
 #: g10/keygen.c:1261
 msgid "SsEeAaQq"
-msgstr ""
+msgstr "SsEeAaQq"
 
 #: g10/keygen.c:1276
 #, c-format
 msgid "Possible actions for a %s key: "
-msgstr ""
+msgstr "%s 密钥可能的操作："
 
 #: g10/keygen.c:1280
 msgid "Current allowed actions: "
-msgstr ""
+msgstr "目前允许的操作："
 
 #: g10/keygen.c:1285
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
-msgstr ""
+msgstr "  (%c) 选择是否用于签字\n"
 
 #: g10/keygen.c:1288
-#, fuzzy, c-format
+#, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
-msgstr "   (%d) ElGamal (�����ڼ���)\n"
+msgstr "  (%c) 选择是否用于加密\n"
 
 #: g10/keygen.c:1291
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
-msgstr ""
+msgstr "  (%c) 选择是否用于认证\n"
 
 #: g10/keygen.c:1294
 #, c-format
 msgid "   (%c) Finished\n"
-msgstr ""
+msgstr "  (%c) 已完成\n"
 
 #: g10/keygen.c:1348
 msgid "Please select what kind of key you want:\n"
-msgstr "��ѡ����Ҫʹ�õ���Կ���ࣺ\n"
+msgstr "请选择您要使用的密钥种类：\n"
 
 #: g10/keygen.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA �� ElGamal (Ĭ��)\n"
+msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
 #: g10/keygen.c:1351
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
-msgstr "   (%d) DSA (������ǩ��)\n"
+msgstr "   (%d) DSA (仅用于签字)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (�����ڼ���)\n"
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1355
 #, c-format
-msgid "   (%d) RSA (sign only)\n"
-msgstr "   (%d) RSA (������ǩ��)\n"
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (仅用于加密)\n"
 
 #: g10/keygen.c:1356
 #, c-format
-msgid "   (%d) RSA (encrypt only)\n"
-msgstr "   (%d) RSA (�����ڼ���)\n"
+msgid "   (%d) RSA (sign only)\n"
+msgstr "   (%d) RSA (仅用于签字)\n"
 
 #: g10/keygen.c:1358
-#, fuzzy, c-format
-msgid "   (%d) RSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (�����ڼ���)\n"
-
-#: g10/keygen.c:1409
 #, c-format
-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��Կ�ԡ�\n"
-"        ��С����Կ�ߴ���  768�ֽ�\n"
-"        Ĭ�ϵ���Կ�ߴ��� 1024�ֽ�\n"
-"    �Ƽ��������Կ�ߴ��� 2048�ֽ�\n"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "����Ҫ�ö�����Կ�ߴ磿(1024)"
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA����Կ�ߴ�ֻ�ܽ��� 512 �� 1024 ֮��\n"
+msgid "   (%d) RSA (encrypt only)\n"
+msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "��Կ�ߴ�̫С��RSA ��Կ�ߴ�����Ҫ�� 1024��\n"
+#: g10/keygen.c:1360
+#, c-format
+msgid "   (%d) RSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "��Կ�ߴ�̫С������Ҫ�� 768��\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA 密钥对会有 1024 位。\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "��Կ�ߴ�̫�����ֻ�ܹ��õ� %d��\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"������ʹ�óߴ���� 2048 ����Կ��\n"
-"��Ϊ������ĻỨȥ�ܶ�ʱ�䣡\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "��ȷ��Ҫ�������Կ�ߴ��� "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "您想要用多大的密钥尺寸？(1024)"
 
-#: g10/keygen.c:1449
-msgid ""
-"Okay, but keep in mind that your monitor and keyboard radiation is also very "
-"vulnerable to attacks!\n"
-msgstr "�ðɣ��������ס������Ļ�ͼ���Ҳ���൱�ױ����ӵģ�\n"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
-msgstr "����Ҫ�����Կ�ߴ��� %u �ֽ�\n"
+msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
-msgstr "���뵽 %u �ֽ�\n"
+msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3684,14 +3625,14 @@ msgid ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 msgstr ""
-"���趨�����Կ����Ч���ޡ�\n"
-"         0 = ��Կ��������\n"
-"      <n>  = ��Կ�� n ������\n"
-"      <n>w = ��Կ�� n �ܺ����\n"
-"      <n>m = ��Կ�� n �º����\n"
-"      <n>y = ��Կ�� n ������\n"
-
-#: g10/keygen.c:1525
+"请设定这把密钥的有效期限。\n"
+"         0 = 密钥永不过期\n"
+"      <n>  = 密钥在 n 天后过期\n"
+"      <n>w = 密钥在 n 周后过期\n"
+"      <n>m = 密钥在 n 月后过期\n"
+"      <n>y = 密钥在 n 年后过期\n"
+
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3700,50 +3641,48 @@ msgid ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 msgstr ""
-"���趨���ǩ�ֵ���Ч���ޡ�\n"
-"         0 = ǩ����������\n"
-"      <n>  = ǩ���� n ������\n"
-"      <n>w = ǩ���� n �ܺ����\n"
-"      <n>m = ǩ���� n �º����\n"
-"      <n>y = ǩ���� n ������\n"
-
-#: g10/keygen.c:1547
+"请设定这份签字的有效期限。\n"
+"         0 = 签字永不过期\n"
+"      <n>  = 签字在 n 天后过期\n"
+"      <n>w = 签字在 n 周后过期\n"
+"      <n>m = 签字在 n 月后过期\n"
+"      <n>y = 签字在 n 年后过期\n"
+
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
-msgstr "��Կ����Ч�����ǣ�(0) "
+msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
-msgstr "ǩ�ֵ���Ч�����Ƕ�ã�(0) "
+msgstr "签字的有效期限是多久？(0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
-msgstr "��Ч����ֵ\n"
+msgstr "无效的数值\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
-msgstr "%s ��Զ�������\n"
+msgstr "%s 永远不会过期\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
-msgstr "%s ���� %s ����\n"
+msgstr "%s 将在 %s 过期\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
-"����ϵͳ�޷���ʾ 2038 ���Ժ�����ڡ�\n"
-"��������������ȷ���� 2106 ��֮ǰ����ݡ�\n"
+"您的系统无法显示 2038 年以后的日期。\n"
+"不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1577
-#, fuzzy
+#: g10/keygen.c:1589
 msgid "Is this correct? (y/N) "
-msgstr "������ȷ��(y/n)"
+msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1620
-#, fuzzy
+#: g10/keygen.c:1632
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -3753,911 +3692,903 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"����Ҫһ���û���ʶ����ʶ������Կ��������������ʵ������\n"
-"ע�ͺ͵����ʼ���ַ��ϳ��û���ʶ��������ʾ��\n"
-"    ��Heinrich Heine (Der Dichter) <[email protected]>��\n"
+"您需要一个用户标识来辨识您的密钥；本软件会用真实姓名、注释和电子邮件地址组"
+"合\n"
+"成用户标识，如下所示：\n"
+"    “Heinrich Heine (Der Dichter) <[email protected]>”\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
-msgstr "��ʵ������"
+msgstr "真实姓名："
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
-msgstr "����������Ч���ַ�\n"
+msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
-msgstr "���������������ֿ�ͷ\n"
+msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
-msgstr "��������Ҫ������ַ���\n"
+msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
-msgstr "�����ʼ���ַ��"
+msgstr "电子邮件地址："
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
-msgstr "�����ʼ���ַ��Ч\n"
+msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
-msgstr "ע�ͣ�"
+msgstr "注释："
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
-msgstr "ע�ͺ�����Ч���ַ�\n"
+msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
-msgstr "������ʹ�á�%s���ַ�����\n"
+msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
 "    \"%s\"\n"
 "\n"
 msgstr ""
-"��ѡ��������û���ʶ��\n"
-"    ��%s��\n"
+"您选择了这个用户标识：\n"
+"    “%s”\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 msgid "Please don't put the email address into the real name or the comment\n"
-msgstr "�벻Ҫ�ѵ����ʼ���ַ�Ž�������ʵ������ע����\n"
+msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
-msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)���˳�(Q)��"
+msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1750
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
-msgstr "��������(N)��ע��(C)�������ʼ���ַ(E)��ȷ��(O)/�˳�(Q)��"
+msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
-msgstr "���ȸ�������\n"
+msgstr "请先改正错误\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
-"����Ҫһ����������������˽Կ��\n"
+"您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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 ""
-"������Ҫ�����롪������뷨ʵ������͸�ˣ�\n"
-"����������Ȼ���������ȥ�������κ�ʱ�򶼿��Ա���������룬\n"
-"����Ҫ�ٴ�ִ��������򣬲���ʹ�á�--edit-key��ѡ��ɡ�\n"
+"您不想要有密码――这个想法实在是遭透了！\n"
+"不过，我仍然会照您想的去做。您任何时候都可以变更您的密码，仅需要\n"
+"再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
-"(�����ô���̡��ƶ���ꡢ��дӲ��֮���)\n"
-"�����������ַ������и��õĻ������㹻��������\n"
+"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
+"鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA ��Կ�Ի��� 1024 �ֽڡ�\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
-msgstr "��Կ������ȡ����\n"
+msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
-msgstr "���ڽ���Կд��`%s'\n"
+msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
-#, fuzzy, c-format
+#: g10/keygen.c:2761 g10/keygen.c:2899
+#, c-format
 msgid "writing secret key stub to `%s'\n"
-msgstr "���ڽ�˽Կд��`%s'\n"
+msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
-msgstr "���ڽ�˽Կд��`%s'\n"
+msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
-msgstr "�Ҳ�����д�Ĺ�ԿԿ�׻���%s\n"
+msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
-msgstr "�Ҳ�����д��˽ԿԿ�׻���%s\n"
+msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
-msgstr "д�빫ԿԿ�׻���%s��ʱ�������� %s\n"
+msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
-msgstr "д��˽ԿԿ�׻���%s��ʱ�������� %s\n"
+msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
-msgstr "��Կ��˽Կ�Ѿ����ɲ���ǩ�֡�\n"
+msgstr "公钥和私钥已经生成并经签字。\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
 msgstr ""
-"��ע�������Կ�������������ܣ����������á�--edit-key��ָ��\n"
-"�������ڼ��ܵ���Կ��\n"
+"请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
+"生成用于加密的子钥。\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
-msgstr "������Կʧ�ܣ�%s\n"
+msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 g10/sign.c:290
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
-msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 g10/sign.c:292
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
-msgstr "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+msgstr "密钥是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
-msgstr "ע�⣺Ϊ v3 ��Կ������Կ��ʧȥ OpenPGP ������\n"
+msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
-#, fuzzy
+#: g10/keygen.c:3052 g10/keygen.c:3174
 msgid "Really create? (y/N) "
-msgstr "���Ҫ������ "
+msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3315
-#, fuzzy, c-format
+#: g10/keygen.c:3327
+#, c-format
 msgid "storing key onto card failed: %s\n"
-msgstr "ɾ����Կ����ʱʧ�ܣ�%s\n"
+msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:3362
-#, fuzzy, c-format
+#: g10/keygen.c:3374
+#, c-format
 msgid "can't create backup file `%s': %s\n"
-msgstr "�޷�������%s����%s\n"
+msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:3385
-#, fuzzy, c-format
+#: g10/keygen.c:3397
+#, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
-msgstr "ע�⣺˽Կ %08lX ���� %s ����\n"
+msgstr "注意：卡密钥的备份已保存到‘%s’\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
-msgstr ""
+msgstr "RSA 余数的长度不为 %d\n"
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
-msgstr ""
+msgstr "公钥指数太大(超过 32 位)\n"
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, 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 "��������"
+msgstr "永不过期"
 
 #: g10/keylist.c:201
 msgid "Critical signature policy: "
-msgstr "�ؼ�ǩ�ֲ��ԣ�"
+msgstr "关键签字策略："
 
 #: g10/keylist.c:203
 msgid "Signature policy: "
-msgstr "ǩ�ֲ��ԣ�"
+msgstr "签字策略："
 
 #: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
-msgstr ""
+msgstr "关键首选公钥服务器："
 
 #: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
-msgstr "���棺�ҵ���Ч�ı������\n"
+msgstr "警告：找到无效的标记数据\n"
 
 #: g10/keylist.c:309
 msgid "Critical signature notation: "
-msgstr "�ؼ�ǩ�ֱ�ǣ�"
+msgstr "关键签字标记："
 
 #: g10/keylist.c:311
 msgid "Signature notation: "
-msgstr "ǩ�ֱ�ǣ�"
+msgstr "签字标记："
 
 #: g10/keylist.c:322
 msgid "not human readable"
-msgstr "���������ܶ�����"
+msgstr "不是人类能读懂的"
 
 #: g10/keylist.c:423
 msgid "Keyring"
-msgstr "Կ�׻�"
+msgstr "钥匙环"
 
-#  of subkey
 #: g10/keylist.c:729
-#, fuzzy, c-format
+#, c-format
 msgid "expired: %s)"
-msgstr " [��������%s]"
+msgstr "已过期：%s)"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
-msgstr "��Կָ�ƣ�"
+msgstr "主钥指纹："
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
-msgstr "��Կָ�ƣ�"
+msgstr "子钥指纹："
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
-msgstr " ��Կָ�ƣ�"
+msgstr " 主钥指纹："
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
-msgstr " ��Կָ�ƣ�"
+msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1446 g10/keylist.c:1450
-#, fuzzy
+#: g10/keylist.c:1440 g10/keylist.c:1444
 msgid "      Key fingerprint ="
-msgstr " ��Կָ�� ="
+msgstr "              密钥指纹 ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
-msgstr ""
+msgstr "     卡序列号 ="
 
 #: g10/keyring.c:1245
-#, fuzzy, c-format
+#, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
-msgstr "���� ASCII ��װʧ�ܣ�%s\n"
+msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
 #: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
-msgstr "���棺�����ļ������л���ì�ܵ���Ϣ��\n"
+msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
 #: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
-msgstr "%s ��û�иı����һ��\n"
+msgstr "%s 是没有改变的那一个\n"
 
 #: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
-msgstr "%s ���µ���һ��\n"
+msgstr "%s 是新的那一个\n"
 
 #: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
-msgstr "���޲�������ܵİ�ȫ��©��\n"
+msgstr "请修补这个可能的安全性漏洞\n"
 
 #: g10/keyring.c:1375
-#, fuzzy, c-format
+#, c-format
 msgid "caching keyring `%s'\n"
-msgstr "���ڼ��Կ�׻���%s��\n"
+msgstr "缓存钥匙环‘%s’\n"
 
 #: g10/keyring.c:1421
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
-msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
+msgstr "目前已缓存 %lu 把密钥(%lu 份签字)\n"
 
 #: g10/keyring.c:1433
-#, fuzzy, c-format
+#, c-format
 msgid "%lu keys cached (%lu signatures)\n"
-msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
+msgstr "缓存了 %lu 把密钥(%lu 份签字)\n"
 
 #: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
-msgstr "%s��Կ�׻��ѽ���\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 "���棺�ڡ�%s�����ѡ���ڴ˴������ڼ�δ��ʹ��\n"
+msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
 #: g10/keyserver.c:378
-#, fuzzy
 msgid "disabled"
-msgstr "disable"
+msgstr "已禁用"
 
 #: g10/keyserver.c:579
 msgid "Enter number(s), N)ext, or Q)uit > "
-msgstr ""
+msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
 #: g10/keyserver.c:662 g10/keyserver.c:1142
-#, fuzzy, c-format
+#, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
 #: g10/keyserver.c:752
-#, fuzzy, c-format
+#, c-format
 msgid "key \"%s\" not found on keyserver\n"
-msgstr "�Ҳ�����%s����Կ��%s\n"
+msgstr "在公钥服务器上找不到密钥“%s”\n"
 
 #: g10/keyserver.c:754
-#, fuzzy
 msgid "key not found on keyserver\n"
-msgstr "�Ҳ�����%s����Կ��%s\n"
+msgstr "在公钥服务器上找不到密钥\n"
 
 #: g10/keyserver.c:896
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s server %s\n"
-msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
+msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
 #: g10/keyserver.c:900
-#, fuzzy, c-format
+#, c-format
 msgid "requesting key %s from %s\n"
-msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
+msgstr "下载密钥 %s，从 %s\n"
 
 #: g10/keyserver.c:1045
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s server %s\n"
-msgstr "������Ѱ��%s������ HKP ������ %s ��\n"
+msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
 #: g10/keyserver.c:1049
-#, fuzzy, c-format
+#, c-format
 msgid "sending key %s to %s\n"
-msgstr ""
-"��\n"
-"�Ѿ�ʹ��������Կ %08lX �� %s ����ǩ��\n"
+msgstr "将密钥‘%s’上传到 %s\n"
 
 #: g10/keyserver.c:1092
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s server %s\n"
-msgstr "������Ѱ��%s������ HKP ������ %s ��\n"
+msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
 #: g10/keyserver.c:1095
-#, fuzzy, c-format
+#, c-format
 msgid "searching for \"%s\" from %s\n"
-msgstr "������Ѱ��%s������ HKP ������ %s ��\n"
+msgstr "搜索“%s”，在 %s 上\n"
 
 #: g10/keyserver.c:1102 g10/keyserver.c:1197
-#, fuzzy
 msgid "no keyserver action!\n"
-msgstr "��Ч�ĵ���ѡ��\n"
+msgstr "公钥服务器无动作！\n"
 
 #: g10/keyserver.c:1150
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
-msgstr ""
+msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
 #: g10/keyserver.c:1159
 msgid "keyserver did not send VERSION\n"
-msgstr ""
+msgstr "公钥服务器未发送 VERSION\n"
 
 #: g10/keyserver.c:1218
 msgid "no keyserver known (use option --keyserver)\n"
-msgstr ""
+msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
 #: g10/keyserver.c:1224
 msgid "external keyserver calls are not supported in this build\n"
-msgstr ""
+msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
 #: g10/keyserver.c:1236
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
-msgstr ""
+msgstr "没有处理‘%s’公钥服务器的程序\n"
 
 #: g10/keyserver.c:1241
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
-msgstr ""
+msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
 #: g10/keyserver.c:1249
 #, c-format
 msgid "gpgkeys_%s does not support handler version %d\n"
-msgstr ""
+msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
 
 #: g10/keyserver.c:1254
-#, fuzzy
 msgid "keyserver timed out\n"
-msgstr "��Կ����������"
+msgstr "公钥服务器超时\n"
 
 #: g10/keyserver.c:1259
-#, fuzzy
 msgid "keyserver internal error\n"
-msgstr "��Կ����������"
+msgstr "公钥服务器内部错误\n"
 
 #: g10/keyserver.c:1268
-#, fuzzy, c-format
+#, c-format
 msgid "keyserver communications error: %s\n"
-msgstr "�޷��ӹ�Կ���������գ�%s\n"
+msgstr "公钥服务器通讯错误：%s\n"
 
 #: g10/keyserver.c:1293 g10/keyserver.c:1327
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
-msgstr ""
+msgstr "“%s”不是一个用户标识：跳过\n"
 
 #: g10/keyserver.c:1578
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
-msgstr "���棺�޷�ɾ����ʱ�ļ�(%s)��%s����%s\n"
+msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
 #: g10/keyserver.c:1600
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing 1 key from %s\n"
-msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
+msgstr "1 个密钥正从 %s 得到更新\n"
 
 #: g10/keyserver.c:1602
-#, fuzzy, c-format
+#, c-format
 msgid "refreshing %d keys from %s\n"
-msgstr "���ڲ�ѯ��Կ %08lX������ %s\n"
+msgstr "%d 个密钥正从 %s 得到更新\n"
 
 #: g10/mainproc.c:248
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
-msgstr "���ܹ��ĻỰ��Կ�ߴ�(%d)����\n"
+msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
 #: g10/mainproc.c:262
 #, c-format
 msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-msgstr "����������δ֪�ĶԳƼ����㷨 (%d)\n"
+msgstr "密码不正确或未知的对称加密算法(%d)\n"
 
 #: g10/mainproc.c:299
 #, c-format
 msgid "%s encrypted session key\n"
-msgstr "%s ���ܹ��ĻỰ��Կ\n"
+msgstr "%s 加密过的会话密钥\n"
 
 #: g10/mainproc.c:309
-#, fuzzy, c-format
+#, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
-msgstr "��δ֪���㷨 %d ����\n"
+msgstr "密码由未知的散列算法 %d 生成\n"
 
 #: g10/mainproc.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "public key is %s\n"
-msgstr "��Կ�� %08lX\n"
+msgstr "公钥是 %s\n"
 
 #: g10/mainproc.c:428
 msgid "public key encrypted data: good DEK\n"
-msgstr "��Կ���ܹ������ݣ���õ� DEK\n"
+msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
 #: g10/mainproc.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
-msgstr "�ó���Ϊ %u �ֽڡ�����Ϊ %s��Կ�׺�Ϊ %08lX�������� %s ����Կ���ܹ�\n"
+msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
 #: g10/mainproc.c:465 g10/pkclist.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "      \"%s\"\n"
-msgstr "                �༴ \""
+msgstr "      “%s”\n"
 
 #: g10/mainproc.c:469
-#, fuzzy, c-format
+#, c-format
 msgid "encrypted with %s key, ID %s\n"
-msgstr "������Ϊ %s��Կ�׺�Ϊ %08lX ����Կ���ܹ�\n"
+msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
 #: g10/mainproc.c:483
 #, c-format
 msgid "public key decryption failed: %s\n"
-msgstr "��Կ����ʧ�ܣ�%s\n"
+msgstr "公钥解密失败：%s\n"
 
 #: g10/mainproc.c:497
 #, c-format
 msgid "encrypted with %lu passphrases\n"
-msgstr "�� %lu ���������\n"
+msgstr "以 %lu 个密码加密\n"
 
 #: g10/mainproc.c:499
 msgid "encrypted with 1 passphrase\n"
-msgstr "�� 1 ���������\n"
+msgstr "以 1 个密码加密\n"
 
 #: g10/mainproc.c:527 g10/mainproc.c:549
 #, c-format
 msgid "assuming %s encrypted data\n"
-msgstr "�ٶ� %s Ϊ���ܹ�������\n"
+msgstr "假定 %s 为加密过的数据\n"
 
 #: g10/mainproc.c:535
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
-msgstr "IDEA �㷨�����ã����� %s ����\n"
+msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
 #: g10/mainproc.c:567
 msgid "decryption okay\n"
-msgstr "���ܳɹ�\n"
+msgstr "解密成功\n"
 
 #: g10/mainproc.c:571
 msgid "WARNING: message was not integrity protected\n"
-msgstr "���棺����δ�ܵ������ı���\n"
+msgstr "警告：报文未受到完整的保护\n"
 
 #: g10/mainproc.c:584
 msgid "WARNING: encrypted message has been manipulated!\n"
-msgstr "���棺���ܹ��ı����Ѿ����죡\n"
+msgstr "警告：加密过的报文已经变造！\n"
 
 #: g10/mainproc.c:590
 #, c-format
 msgid "decryption failed: %s\n"
-msgstr "����ʧ�ܣ�%s\n"
+msgstr "解密失败：%s\n"
 
 #: g10/mainproc.c:610
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
-msgstr "ע�⣺������Ҫ������ֻ�Ķ������̡�\n"
+msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
 #: g10/mainproc.c:612
 #, c-format
 msgid "original file name='%.*s'\n"
-msgstr "ԭʼ�ļ��� =��%.*s��\n"
+msgstr "原始文件名 =‘%.*s’\n"
 
 #: g10/mainproc.c:784
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
-msgstr "�����ĵ���֤�顪�����á�gpg --import����Ӧ��\n"
+msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
 #: g10/mainproc.c:1288
 msgid "signature verification suppressed\n"
-msgstr "ǩ����֤�ѱ�����\n"
+msgstr "签字验证已被抑制\n"
 
 #: g10/mainproc.c:1330 g10/mainproc.c:1340
 msgid "can't handle these multiple signatures\n"
-msgstr "�޷�������Щ����ǩ��\n"
+msgstr "无法处理这些多重签字\n"
 
 #: g10/mainproc.c:1350
-#, fuzzy, c-format
+#, c-format
 msgid "Signature made %s\n"
-msgstr "���ǩ������ %s ���ڡ�\n"
+msgstr "签字建立于 %s\n"
 
 #: g10/mainproc.c:1351
-#, fuzzy, c-format
+#, c-format
 msgid "               using %s key %s\n"
-msgstr "                �༴ \""
+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 ������ǩ�֣�ʹ�� %s��Կ�׺� %08lX\n"
+msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
 
 #: g10/mainproc.c:1375
 msgid "Key available at: "
-msgstr "��Կ��ȡ�ԣ�"
+msgstr "可用的密钥在："
 
 #: g10/mainproc.c:1480 g10/mainproc.c:1528
-#, fuzzy, c-format
+#, c-format
 msgid "BAD signature from \"%s\""
-msgstr "���𻵵�ǩ�֣�������\""
+msgstr "已损坏的签字，来自于“%s”"
 
 #: g10/mainproc.c:1482 g10/mainproc.c:1530
-#, fuzzy, c-format
+#, c-format
 msgid "Expired signature from \"%s\""
-msgstr "���ڵ�ǩ�֣�������\""
+msgstr "过期的签字，来自于“%s”"
 
 #: g10/mainproc.c:1484 g10/mainproc.c:1532
-#, fuzzy, c-format
+#, c-format
 msgid "Good signature from \"%s\""
-msgstr "��õ�ǩ�֣�������\""
+msgstr "完好的签字，来自于“%s”"
 
 #: g10/mainproc.c:1536
 msgid "[uncertain]"
-msgstr "[��ȷ��]"
+msgstr "[不确定]"
 
 #: g10/mainproc.c:1568
-#, fuzzy, c-format
+#, c-format
 msgid "                aka \"%s\""
-msgstr "                �༴ \""
+msgstr "              亦即“%s”"
 
 #: g10/mainproc.c:1662
 #, c-format
 msgid "Signature expired %s\n"
-msgstr "���ǩ������ %s ���ڡ�\n"
+msgstr "这份签字已于 %s 过期。\n"
 
 #: g10/mainproc.c:1667
 #, c-format
 msgid "Signature expires %s\n"
-msgstr "���ǩ���� %s ���ڡ�\n"
+msgstr "这份签字在 %s 过期。\n"
 
 #: g10/mainproc.c:1670
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
-msgstr "%sǩ�֣�ɢ���㷨 %s\n"
+msgstr "%s签字，散列算法 %s\n"
 
 #: g10/mainproc.c:1671
 msgid "binary"
-msgstr "������"
+msgstr "二进制"
 
 #: g10/mainproc.c:1672
 msgid "textmode"
-msgstr "�ı�ģʽ"
+msgstr "文本模式"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
-msgstr "δ֪"
+msgstr "未知"
 
 #: g10/mainproc.c:1692
 #, c-format
 msgid "Can't check signature: %s\n"
-msgstr "�޷����ǩ�֣�%s\n"
+msgstr "无法检查签字：%s\n"
 
 #: g10/mainproc.c:1760 g10/mainproc.c:1776 g10/mainproc.c:1862
 msgid "not a detached signature\n"
-msgstr "����һ�ݷ����ǩ��\n"
+msgstr "不是一份分离的签字\n"
 
 #: g10/mainproc.c:1803
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
-msgstr "���棺��⵽����ǩ�֡�ֻ����һ��ǩ�֡�\n"
+msgstr "警告：检测到多重签字。只检查第一个签字。\n"
 
 #: g10/mainproc.c:1811
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
-msgstr "�ȼ� 0x%02x �Ķ���ǩ��\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 "�� proc_tree() �м�⵽��Ч�ĸ���\n"
+msgstr "在 proc_tree() 中检测到无效的根包\n"
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
-msgstr "�޷����ú����ڴ�ת����%s\n"
+msgstr "无法禁用核心内存转储：%s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
-#, fuzzy, c-format
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
+#, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
-msgstr "�޷����ļ���%s\n"
+msgstr "‘%s’的 fstat 在 %s 中出错：%s\n"
 
-#: g10/misc.c:186
-#, fuzzy, c-format
+#: g10/misc.c:190
+#, c-format
 msgid "fstat(%d) failed in %s: %s\n"
-msgstr "���ζ����ݿ⣺��ȡʧ��(n=%d)��%s\n"
+msgstr "fstat(%d) 在 %s 中出错：%s\n"
+
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "无法操作公钥算法 %d\n"
+
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "尚未实现的对称加密算法"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "��Ӧʹ��ʵ���Ե��㷨��\n"
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s签字，散列算法 %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "���Ƽ�ʹ����������㷨���뻻�ø����ϱ�׼���㷨��\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
-msgstr "IDEA �㷨���������\n"
+msgstr "IDEA 算法插件不存在\n"
 
 #: g10/misc.c:431
 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"
+msgstr "请访问 http://www.gnupg.org/why-not-idea.html 以获得更详细的信息\n"
 
 #: g10/misc.c:664
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
-msgstr "%s:%d�����鲻ʹ�õ�ѡ�%s��\n"
+msgstr "%s:%d：不建议使用该选项“%s”\n"
 
 #: g10/misc.c:668
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "���棺��%s��ѡ���Ѳ�����ʹ��\n"
+msgstr "警告：“%s”选项已不建议使用\n"
 
 #: g10/misc.c:670
 #, c-format
 msgid "please use \"%s%s\" instead\n"
-msgstr "���ԡ�%s%s������\n"
+msgstr "请以“%s%s”代替\n"
 
 #: g10/misc.c:681
 msgid "Uncompressed"
-msgstr "δ��ѹ��"
+msgstr "不压缩"
 
 #: g10/misc.c:706
-#, fuzzy
 msgid "uncompressed|none"
-msgstr "δ��ѹ��"
+msgstr "未压缩|无"
 
 #: g10/misc.c:816
 #, c-format
 msgid "this message may not be usable by %s\n"
-msgstr "%s Ҳ������ʹ���������\n"
+msgstr "%s 也许不能使用这个报文\n"
 
 #: g10/misc.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "ambiguous option `%s'\n"
-msgstr "�ӡ�%s����ȡѡ��\n"
+msgstr "有歧义的选项‘%s’\n"
 
 #: g10/misc.c:998
-#, fuzzy, c-format
+#, c-format
 msgid "unknown option `%s'\n"
-msgstr "δ֪��Ĭ���ռ��ߡ�%s��\n"
+msgstr "未知的选项 '%s'\n"
 
 #: g10/openfile.c:84
 #, c-format
 msgid "File `%s' exists. "
-msgstr "�ļ���%s���Ѵ��ڡ� "
+msgstr "文件‘%s’已存在。 "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
-msgstr "�Ƿ񸲸�(y/N)��"
+msgstr "是否覆盖？(y/N)"
 
 #: g10/openfile.c:119
 #, c-format
 msgid "%s: unknown suffix\n"
-msgstr "%s��δ֪�ĺ�׺��\n"
+msgstr "%s：未知的后缀名\n"
 
 #: g10/openfile.c:141
 msgid "Enter new filename"
-msgstr "�������µ��ļ���"
+msgstr "请输入新的文件名"
 
 #: g10/openfile.c:184
 msgid "writing to stdout\n"
-msgstr "����д�뵽��׼���\n"
+msgstr "正在写入到标准输出\n"
 
 #: g10/openfile.c:296
 #, c-format
 msgid "assuming signed data in `%s'\n"
-msgstr "�ٶ���ǩ�ֵ������ڡ�%s��\n"
+msgstr "假定被签字的数据是‘%s’\n"
 
 #: g10/openfile.c:375
 #, c-format
 msgid "new configuration file `%s' created\n"
-msgstr "�µ������ļ���%s���ѽ���\n"
+msgstr "新的配置文件‘%s’已建立\n"
 
 #: g10/openfile.c:377
 #, c-format
 msgid "WARNING: options in `%s' are not yet active during this run\n"
-msgstr "���棺�ڡ�%s�����ѡ���ڴ˴������ڼ�δ��ʹ��\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
 #, c-format
 msgid "can't handle public key algorithm %d\n"
-msgstr "�޷�������Կ�㷨 %d\n"
+msgstr "无法操作公钥算法 %d\n"
 
 #: g10/parse-packet.c:688
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
-msgstr "���棺����DZ�ڰ�ȫ��в�ĶԳƼ��ܻỰ��Կ\n"
+msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
 #: g10/parse-packet.c:1112
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
-msgstr "%d �����Ӱ��趨�˹ؼ��ֽ�\n"
+msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
-msgstr "gpg-agent �ڴ˴��Ự���޷�ʹ��\n"
+msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
-msgstr "�޷��趨��������ͻ��˵Ľ��̱�ʶ\n"
+msgstr "无法设定代理程序客户端的进程标识\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
-msgstr "�޷�ȡ�ô�����������ķ�������ȡ�ļ�������\n"
+msgstr "无法取得代理程序所需的服务器读取文件描述符\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
-msgstr "�޷�ȡ�ô�����������ķ�����д���ļ�������\n"
+msgstr "无法取得代理程序所需的服务器写入文件描述符\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
-msgstr "GPG_AGENT_INFO ����������ʽ����\n"
+msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
-msgstr "��֧�� gpg-agent Э��汾 %d\n"
+msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
-msgstr "�޷���������%s����%s\n"
+msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
-msgstr "�� gpg-agent ͨѶ������\n"
+msgstr "与 gpg-agent 通讯有问题\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
-msgstr "������������⡪������ͣ�ô�������\n"
+msgstr "代理程序的问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
-#, fuzzy, c-format
+#: g10/passphrase.c:698 g10/passphrase.c:1203
+#, c-format
 msgid " (main key ID %s)"
-msgstr "(��Կ�׺� %08lX)"
+msgstr "(主钥匙号 %s)"
 
-#: g10/passphrase.c:698
-#, fuzzy, c-format
+#: g10/passphrase.c:712
+#, 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 ""
-"����Ҫ�����û����������⿪˽Կ��\n"
-"��%.*s��\n"
-"%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s%s\n"
+"您需要这个用户的密码来解开私钥：\n"
+"“%.*s”\n"
+"%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
-msgstr "��������һ������\n"
+msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
-msgstr "����������\n"
+msgstr "请输入密码\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
-msgstr "����̫��\n"
+msgstr "密码太长\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
-msgstr "����������Ӧ��Ч\n"
+msgstr "代理程序响应无效\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
-msgstr "�û�ȡ��\n"
+msgstr "用户取消\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
-msgstr "������������⣺�������򷵻� 0x%lx\n"
+msgstr "代理程序的问题：代理程序返回 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
-#, fuzzy
-msgid "can't query password in batch mode\n"
-msgstr "��������ģʽ���޷�ѯ������\n"
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
+msgid "can't query passphrase in batch mode\n"
+msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
-msgstr "���������룺"
+msgstr "请输入密码："
 
-#: g10/passphrase.c:1141
-#, fuzzy, c-format
+#: g10/passphrase.c:1184
+#, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
-msgstr ""
-"\n"
-"����Ҫ����ʹ���ߵ����룬���ܽ⿪˽Կ��\n"
-"\""
+msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:1147
-#, fuzzy, c-format
+#: g10/passphrase.c:1190
+#, c-format
 msgid "%u-bit %s key, ID %s, created %s"
-msgstr "%u �ֽڵ� %s ��Կ��Կ�׺� %08lX�������� %s"
+msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
-msgstr ""
+msgstr "        (主钥 %s 的子钥)"
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
-msgstr "��������һ�����룺"
+msgstr "请再输入一次密码："
 
 #: g10/photoid.c:66
 msgid ""
@@ -4668,70 +4599,68 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 "\n"
-"����ѡһ��ͼƬ��Ϊ������Ƭ��ʶ ������ͼƬһ��Ҫ��JPEG�ļ���\n"
-"���ס����ͼƬ�ᱻ��������Ĺ�Կ���������˷dz����ͼƬ�Ļ���\n"
-"������ԿҲ���ɷdz���\n"
-"�뾡����ͼƬ�ߴ������240x288���ң����Ǹ�����ijߴ硣\n"
+"请挑选一张图片作为您的照片标识 。这张图片一定要是JPEG文件。请记住这张图\n"
+"片会被存放在您的公钥里。如果您挑了非常大的图片的话，您的密钥也会变得非\n"
+"常大！请尽量把图片尺寸控制在240x288左右，这是个理想的尺寸。\n"
 
 #: g10/photoid.c:80
 msgid "Enter JPEG filename for photo ID: "
-msgstr "����Ҫ������Ƭ��ʶ��JPEG�ļ����� "
+msgstr "输入要当作相片标识的JPEG文件名： "
 
 #: g10/photoid.c:94
-#, fuzzy, c-format
+#, c-format
 msgid "unable to open JPEG file `%s': %s\n"
-msgstr "�޷����ļ���%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 "��ȷ��Ҫ������(y/N)"
+msgstr "您确定要用它吗？(y/N)"
 
 #: g10/photoid.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "`%s' is not a JPEG file\n"
-msgstr "��%s������һ�� JPEG �ļ�\n"
+msgstr "“%s”不是一个 JPEG 文件\n"
 
 #: g10/photoid.c:136
 msgid "Is this photo correct (y/N/q)? "
-msgstr "������Ƭ��ȷ��(y/N/q)"
+msgstr "这张照片正确吗？(y/N/q)"
 
 #: g10/photoid.c:338
 msgid "unable to display photo ID!\n"
-msgstr "�޷���ʾ��Ƭ��ʶ��\n"
+msgstr "无法显示照片标识！\n"
 
 #: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
-msgstr "δָ��ԭ��"
+msgstr "未指定原因"
 
 #: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
-msgstr "��Կ���滻"
+msgstr "密钥被替换"
 
 #: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
-msgstr "��Կ��й©"
+msgstr "密钥已泄漏"
 
 #: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
-msgstr "��Կ����ʹ��"
+msgstr "密钥不再使用"
 
 #: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
-msgstr "�û���ʶ������Ч"
+msgstr "用户标识不再有效"
 
 #: g10/pkclist.c:73
 msgid "reason for revocation: "
-msgstr "����ԭ��"
+msgstr "吊销原因："
 
 #: g10/pkclist.c:90
 msgid "revocation comment: "
-msgstr "����ע�ͣ�"
+msgstr "吊销注释："
 
 #  a string with valid answers
 #: g10/pkclist.c:205
@@ -4739,52 +4668,45 @@ msgid "iImMqQsS"
 msgstr "iImMqQsS"
 
 #: g10/pkclist.c:213
-#, fuzzy
 msgid "No trust value assigned to:\n"
-msgstr ""
-"������Ŀû��ָ�����ζȣ�\n"
-"%4u%c/%08lX %s \""
+msgstr "下列项目没有指定信任度：\n"
 
 #: g10/pkclist.c:245
-#, fuzzy, c-format
+#, c-format
 msgid "  aka \"%s\"\n"
-msgstr "                �༴ \""
+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 "�����Կ�п����������������\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 = ��֪��\n"
+msgstr " %d = 我不知道或我不作答\n"
 
 #: g10/pkclist.c:272
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I do NOT trust\n"
-msgstr " %d = �Ҳ�����\n"
+msgstr " %d = 我不相信\n"
 
 #: g10/pkclist.c:278
-#, fuzzy, c-format
+#, c-format
 msgid "  %d = I trust ultimately\n"
-msgstr " %d = �Ҿ�������\n"
+msgstr " %d = 我绝对相信\n"
 
 #: g10/pkclist.c:284
-#, fuzzy
 msgid "  m = back to the main menu\n"
-msgstr " m = �ص����˵�\n"
+msgstr " m = 回到主菜单\n"
 
 #: g10/pkclist.c:287
-#, fuzzy
 msgid "  s = skip this key\n"
-msgstr " s = ���������Կ\n"
+msgstr " s = 跳过这把密钥\n"
 
 #: g10/pkclist.c:288
-#, fuzzy
 msgid "  q = quit\n"
-msgstr " q = �˳�\n"
+msgstr "  q = 退出\n"
 
 #: g10/pkclist.c:292
 #, c-format
@@ -4792,130 +4714,127 @@ 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 "���ľ�����ʲô��"
+msgstr "您的决定是什么？"
 
 #: g10/pkclist.c:319
-#, fuzzy
 msgid "Do you really want to set this key to ultimate trust? (y/N) "
-msgstr "�����Ҫ�������Կ��ɾ������Σ�"
+msgstr "您真的要把这把密钥设成绝对信任？(y/N)"
 
 #: g10/pkclist.c:333
 msgid "Certificates leading to an ultimately trusted key:\n"
-msgstr "���������ε���Կ��֤�飺\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��û��֤�ݱ��������Կ��������������Ƶij�����\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��û��֤�ݱ��������Կ��������������Ƶij�����\n"
+msgstr "%s：只有有限的证据表明这把密钥属于它所声称的持有者\n"
 
 #: g10/pkclist.c:429
-#, fuzzy
 msgid "This key probably belongs to the named user\n"
-msgstr "�����Կ�п����������������\n"
+msgstr "这把密钥有可能属于它所声称的持有者\n"
 
 #: g10/pkclist.c:434
 msgid "This key belongs to us\n"
-msgstr "�����Կ���������ǵ�\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 ""
-"�����Կ����һ�������û���ʶ���Ƶ��Ǹ��ˡ�\n"
-"��������֪���Լ�����ʲô��\n"
-"����������һ������ش�yes\n"
+"这把密钥并不一定属于用户标识声称的那个人。如果您真的知道自\n"
+"己在做什么，您可以在下一个问题回答 yes。\n"
 
 #: g10/pkclist.c:467
-#, fuzzy
 msgid "Use this key anyway? (y/N) "
-msgstr "������λ���ʹ�������Կ�� "
+msgstr "无论如何还是使用这把密钥吗？(y/N)"
 
 #: g10/pkclist.c:501
 msgid "WARNING: Using untrusted key!\n"
-msgstr "���棺����ʹ�ò������ε���Կ��\n"
+msgstr "警告：正在使用不被信任的密钥！\n"
 
 #: g10/pkclist.c:508
 msgid "WARNING: this key might be revoked (revocation key not present)\n"
-msgstr "���棺����Կ�����ѱ����� (������Կ������)\n"
+msgstr "警告：此密钥可能已被吊销(吊销密钥不存在)\n"
 
 #: g10/pkclist.c:517
 msgid "WARNING: This key has been revoked by its designated revoker!\n"
-msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
+msgstr "警告：这把密钥已经被它的指定吊销者吊销了！\n"
 
 #: g10/pkclist.c:520
 msgid "WARNING: This key has been revoked by its owner!\n"
-msgstr "���棺�����Կ�Ѿ������ij����ߵ����ˣ�\n"
+msgstr "警告：这把密钥已经被它的持有者吊销了！\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
-msgstr "      ��������ǩ���п�����α��ġ�\n"
+msgid "         This could mean that the signature is forged.\n"
+msgstr "         这表明这个签字有可能是伪造的。\n"
 
 #: g10/pkclist.c:527
 msgid "WARNING: This subkey has been revoked by its owner!\n"
-msgstr "���棺�����Կ�Ѿ������ij����˵����ˣ�\n"
+msgstr "警告：这把子钥已经被它的持有人吊销了！\n"
 
 #: g10/pkclist.c:532
 msgid "Note: This key has been disabled.\n"
-msgstr "ע�⣺�����Կ�Ѿ��������ˡ�\n"
+msgstr "注意：这把密钥已经被禁用了。\n"
 
 #: g10/pkclist.c:537
 msgid "Note: This key has expired!\n"
-msgstr "ע�⣺�����Կ�Ѿ������ˣ�\n"
+msgstr "注意：这把密钥已经过期了！\n"
 
 #: g10/pkclist.c:548
 msgid "WARNING: This key is not certified with a trusted signature!\n"
-msgstr "���棺�����Կδ�������ε�ǩ����֤��\n"
+msgstr "警告：这把密钥未经受信任的签字认证！\n"
 
 #: g10/pkclist.c:550
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
-msgstr "      û��֤�ݱ������ǩ�������������Ƶij����ߡ�\n"
+msgstr "      没有证据表明这个签字属于它所声称的持有者。\n"
 
 #: g10/pkclist.c:558
 msgid "WARNING: We do NOT trust this key!\n"
-msgstr "���棺���Dz����������Կ��\n"
+msgstr "警告：我们不信任这把密钥！\n"
 
 #: g10/pkclist.c:559
 msgid "         The signature is probably a FORGERY.\n"
-msgstr "      ���ǩ�ֺ��п�����α��ġ�\n"
+msgstr "      这个签字很有可能是伪造的。\n"
 
 #: g10/pkclist.c:567
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
-msgstr "���棺�����Կδ�����㹻���ζȵ�ǩ������֤��\n"
+msgstr "警告：这把密钥未经有足够信任度的签字所认证。\n"
 
 #: g10/pkclist.c:569
 msgid "         It is not certain that the signature belongs to the owner.\n"
-msgstr "      ���ǩ�ֲ���һ�������������Ƶij�����\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����������%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: ����������Կ�Ѵ���\n"
+msgstr "%s: 已跳过：公钥已存在\n"
 
 #: g10/pkclist.c:786
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
-msgstr "��û��ָ���û���ʶ��(�����������������á�-r��ָ��)\n"
+msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "当前收件人：\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -4923,168 +4842,166 @@ msgid ""
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 "\n"
-"�����û���ʶ���Կհ��н�����"
+"输入用户标识。以空白行结束："
 
 #: g10/pkclist.c:844
 msgid "No such user ID.\n"
-msgstr "û������û���ʶ��\n"
+msgstr "没有这个用户标识。\n"
 
 #: g10/pkclist.c:849 g10/pkclist.c:911
 msgid "skipped: public key already set as default recipient\n"
-msgstr "����������Կ�ѱ���ΪĬ���ռ���\n"
+msgstr "已跳过：公钥已被设为默认收件者\n"
 
 #: g10/pkclist.c:867
 msgid "Public key is disabled.\n"
-msgstr "��Կ�����á�\n"
+msgstr "公钥被禁用。\n"
 
 #: g10/pkclist.c:874
 msgid "skipped: public key already set\n"
-msgstr "����������Կ�ѱ��趨\n"
+msgstr "已跳过：公钥已被设定\n"
 
 #: g10/pkclist.c:903
-#, fuzzy, c-format
+#, c-format
 msgid "unknown default recipient \"%s\"\n"
-msgstr "δ֪��Ĭ���ռ��ߡ�%s��\n"
+msgstr "未知的默认收件者“%s”\n"
 
 #: g10/pkclist.c:948
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
-msgstr "%s������������Կ�ѱ�����\n"
+msgstr "%s：已跳过：公钥已被禁用\n"
 
 #: g10/pkclist.c:1003
 msgid "no valid addressees\n"
-msgstr "û����Ч�ĵ�ַ\n"
+msgstr "没有有效的地址\n"
 
 #: g10/plaintext.c:90
 msgid "data not saved; use option \"--output\" to save it\n"
-msgstr "����δ�����棻���á�--output��ѡ������������\n"
+msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: g10/plaintext.c:135 g10/plaintext.c:140 g10/plaintext.c:158
 #, c-format
 msgid "error creating `%s': %s\n"
-msgstr "������%s��ʱ��������%s\n"
+msgstr "建立‘%s’时发生错误：%s\n"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
-msgstr "�����ǩ�֡�\n"
+msgstr "分离的签字。\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
-msgstr "�����������ļ������ƣ� "
+msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
-msgstr "���ڴӱ�׼�����ȡ ...\n"
+msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
-msgstr "����ǩ�ֵ�����\n"
+msgstr "不含签字的数据\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
-msgstr "�޷�����ǩ�ֵ����ݡ�%s��\n"
+msgstr "无法打开有签字的数据‘%s’\n"
 
 #: g10/pubkey-enc.c:103
-#, fuzzy, c-format
+#, c-format
 msgid "anonymous recipient; trying secret key %s ...\n"
-msgstr "�����ռ��ߣ����ڳ���ʹ��˽Կ %08lX  ...\n"
+msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
 
 #: g10/pubkey-enc.c:119
 msgid "okay, we are the anonymous recipient.\n"
-msgstr "�ܺã����Ǿ��������ռ��ߡ�\n"
+msgstr "很好，我们就是匿名收件者。\n"
 
 #: g10/pubkey-enc.c:207
 msgid "old encoding of the DEK is not supported\n"
-msgstr "��֧�־�ʽ�� DEK ����\n"
+msgstr "不支持旧式的 DEK 编码\n"
 
 #: g10/pubkey-enc.c:228
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
-msgstr "�ԳƼ����㷨 %d%s δ֪����ͣ��\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 "ע�⣺��ѡ�����Ҳ��������㷨 %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 "ע�⣺˽Կ %08lX ���� %s ����\n"
+msgstr "注意：私钥 %s 已于 %s 过期\n"
 
 #: g10/pubkey-enc.c:292
 msgid "NOTE: key has been revoked"
-msgstr "ע�⣺��Կ�ѱ�����"
+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 ʧ�ܣ�%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��û���û���ʶ\n"
+msgstr "密钥 %s：没有有效的用户标识\n"
 
 #: g10/revoke.c:272
 msgid "To be revoked by:\n"
-msgstr "���������������ߣ�\n"
+msgstr "将被吊销，吊销者：\n"
 
 #: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
-msgstr "(����һ�����еĵ�����Կ)\n"
+msgstr "(这是一把敏感的吊销密钥)\n"
 
 #: g10/revoke.c:280
-#, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
-msgstr "ҪΪ�����Կ����һ�ݵ���֤���� "
+msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
 #: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
-msgstr "��ǿ��ʹ�� ASCII ��װ���������\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 ʧ�ܣ� %s\n"
+msgstr "make_keysig_packet 失败： %s\n"
 
 #: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
-msgstr "�ѽ�������֤�顣\n"
+msgstr "已建立吊销证书。\n"
 
 #: g10/revoke.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "no revocation keys found for \"%s\"\n"
-msgstr "û���ҵ���%s���õĵ�����Կ\n"
+msgstr "没有找到“%s”的吊销密钥\n"
 
 #: g10/revoke.c:432
-#, fuzzy, c-format
+#, c-format
 msgid "secret key \"%s\" not found: %s\n"
-msgstr "�Ҳ�����%s��˽Կ��%s\n"
+msgstr "找不到私钥“%s”：%s\n"
 
 #: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
-msgstr "û�����Ӧ�Ĺ�Կ��%s\n"
+msgstr "没有相对应的公钥：%s\n"
 
 #: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
-msgstr "��Կ��˽Կ���Ǻϣ�\n"
+msgstr "公钥与私钥不吻合！\n"
 
 #: g10/revoke.c:479
-#, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
-msgstr "ҪΪ�����Կ����һ�ݵ���֤���� "
+msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
 #: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
-msgstr "δ֪�ı����㷨\n"
+msgstr "未知的保护算法\n"
 
 #: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
-msgstr "ע�⣺�����Կû�б�������\n"
+msgstr "注意：这把密钥没有被保护！\n"
 
 #: g10/revoke.c:551
 msgid ""
@@ -5096,245 +5013,237 @@ 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 ""
-"�ѽ�������֤�顣\n"
+"已建立吊销证书。\n"
 "\n"
-"�������ļ�ת�Ƶ�һ�������������Ľ���(������)�ϣ�\n"
-"��������ܹ�ȡ�����֤��Ļ�����ô��������������\n"
-"Կ�޷�����ʹ�á������ƾ֤��ӡ�����ٲص���ȫ�ĵ�\n"
-"��Ҳ�Ǻܺõķ������������ı���ý����ٶ��޷���ȡ��\n"
-"����ǧ��С�ģ����Ļ����ϵĴ�ӡϵͳ���ܻ��ڴ�ӡ��\n"
-"���а���Щ������ʱ��ij��������Ҳ�ܹ����õ��ĵط���\n"
+"请把这个文件转移到一个可隐藏起来的介质(如软盘)上；如果坏人能够取得这\n"
+"份证书的话，那么他就能让您的密钥无法继续使用。把这份凭证打印出来再藏\n"
+"到安全的地方也是很好的方法，以免您的保存媒体损毁而无法读取。但是千万\n"
+"小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
+"人也能够看得到的地方！\n"
 
 #: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
-msgstr "��ѡ�������ԭ��\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 "(Ҳ��������Ҫ������ѡ��%d)\n"
+msgstr "(也许您会想要在这里选择 %d)\n"
 
 #: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
-msgstr "����������(��ѡ)���Կհ��н�����\n"
+msgstr "请输入描述(可选)；以空白行结束：\n"
 
 #: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
-msgstr "����ԭ��%s\n"
+msgstr "吊销原因：%s\n"
 
 #: g10/revoke.c:675
 msgid "(No description given)\n"
-msgstr "(����������)\n"
+msgstr "(不给定描述)\n"
 
 #: g10/revoke.c:680
-#, fuzzy
 msgid "Is this okay? (y/N) "
-msgstr "���������� "
+msgstr "这样可以吗？ "
 
 #: g10/seckey-cert.c:54
 msgid "secret key parts are not available\n"
-msgstr "˽Կ���ֲ�����\n"
+msgstr "私钥部分不可用\n"
 
 #: g10/seckey-cert.c:60
 #, c-format
 msgid "protection algorithm %d%s is not supported\n"
-msgstr "�����㷨 %d%s δ��֧��\n"
+msgstr "保护算法 %d%s 未被支持\n"
 
 #: g10/seckey-cert.c:71
-#, fuzzy, c-format
+#, c-format
 msgid "protection digest %d is not supported\n"
-msgstr "�����㷨 %d%s δ��֧��\n"
+msgstr "不支持保护散列 %d\n"
 
 #: g10/seckey-cert.c:250
 msgid "Invalid passphrase; please try again"
-msgstr "��Ч�����룻������һ��"
+msgstr "无效的密码；请再试一次"
 
 #: g10/seckey-cert.c:251
 #, c-format
 msgid "%s ...\n"
-msgstr "%s ...\n"
+msgstr "%s……\n"
 
 #: g10/seckey-cert.c:311
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
-msgstr "���棺��⵽����Կ������������롣\n"
+msgstr "警告：检测到弱密钥――请更换密码。\n"
 
 #: g10/seckey-cert.c:349
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
-msgstr "���ڲ���˽Կ����ʹ�õľ�ʽ 16 �ֽ�У���\n"
+msgstr "正在产生私钥保护使用的旧式 16 位校验和\n"
 
 #: g10/seskey.c:52
 msgid "weak key created - retrying\n"
-msgstr "����������Կ������������\n"
+msgstr "建立了弱密钥――正在重试\n"
 
 #: g10/seskey.c:57
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
-msgstr "�ԳƼ����޷�������������Կ���Ѿ����� %d �Σ�\n"
+msgstr "对称加密无法避免生成弱密钥；已经尝试 %d 次！\n"
 
 #: g10/seskey.c:213
 msgid "DSA requires the use of a 160 bit hash algorithm\n"
-msgstr "DSA Ҫ��ʹ�� 160 �ֽڵ�ɢ���㷨\n"
+msgstr "DSA 要求使用 160 位的散列算法\n"
 
 #: g10/sig-check.c:75
 msgid "WARNING: signature digest conflict in message\n"
-msgstr "���棺ǩ��ɢ��ֵ�뱨�IJ�һ��\n"
+msgstr "警告：签字散列值与报文不一致\n"
 
 #: g10/sig-check.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
-msgstr "���棺ǩ����Կ %08lX δ��������֤\n"
+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 "���棺ǩ����Կ %08lX ������֤��Ч\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 ����ǩ��ǰ %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 ����ǩ��ǰ %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 "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\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 "��Կ���� %lu ����δ�����ɵ�(��������Ϊʱ��Ť����ʱ�ӵ�����)\n"
+msgstr "密钥 %s 是在 %lu 秒后的未来生成的(可能是因为时空扭曲或时钟的问题)\n"
 
 #: g10/sig-check.c:192
-#, fuzzy, c-format
+#, c-format
 msgid "NOTE: signature key %s expired %s\n"
-msgstr "ע�⣺ǩ����Կ %08lX ���� %s ����\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 ��ǩ������ij��δ֪�Ĺؼ��ֽڳ�����������\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��û����Կ�������������Կ\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��û������Կ��ǩ�ֶ�Ӧ����Կ\n"
+msgstr "密钥 %s：没有子钥绑定签字所需的子钥\n"
 
 #: g10/sign.c:85
 msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
-msgstr "�޷��� v3 (PGP 2.x��ʽ)��ǩ���ڷ���������\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 "�޷��� v3 (PGP 2.x��ʽ)����Կǩ���ڷ���������\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 "���棺��� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
+msgstr "警告：标记 %% 无法扩展(太大了)。现在使用未扩展的。\n"
 
 #: g10/sign.c:138
 msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
-msgstr "�޷��� v3 (PGP 2.x��ʽ)��ǩ���ڷ������ 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 "�޷��� v3 (PGP 2.x��ʽ)����Կǩ���ڷ������ 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 "���棺���� URL �� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\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 "���棺���� URL �� %% �޷���չ(̫����)������ʹ��δ��չ�ġ�\n"
+msgstr "警告：无法 %%-扩展首选公钥服务器 URL (太大了)。现在使用未扩展的。\n"
 
 #: g10/sign.c:364
 #, c-format
 msgid "checking created signature failed: %s\n"
-msgstr "����ѽ�����ǩ��ʱ�������� %s\n"
+msgstr "检查已建立的签字时发生错误： %s\n"
 
 #: g10/sign.c:373
-#, fuzzy, c-format
+#, c-format
 msgid "%s/%s signature from: \"%s\"\n"
-msgstr "%sǩ�����ԣ���%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 "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
-
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "����д�롮%s��\n"
+msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做分离签字\n"
 
-#: g10/sign.c:807
-#, fuzzy, c-format
+#: g10/sign.c:808
+#, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
-msgstr "ǿ��ʹ�õ� %s (%d)ɢ���㷨�����ռ��ߵ���ѡ����\n"
+msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
-msgstr "����ǩ�֣�"
+msgstr "正在签字："
 
-#: g10/sign.c:1006
+#: g10/sign.c:1007
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
-msgstr "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
+msgstr "您在 --pgp2 模式下只能够使用 PGP 2.x 样式的密钥来做明文签字\n"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
-msgstr "%s ���ܽ�������\n"
+msgstr "%s 加密将被采用\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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 "��Կδ����ʾΪ����ȫ����������ٵ��������������ͬʹ�ã�\n"
+msgstr "密钥未被标示为不安全――不能与假的随机数发生器共同使用！\n"
 
-#: g10/skclist.c:158
-#, fuzzy, c-format
+#: g10/skclist.c:157
+#, c-format
 msgid "skipped \"%s\": duplicated\n"
-msgstr "��%s�����������ظ�\n"
+msgstr "“%s”已跳过：重复\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
-#, fuzzy, c-format
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
+#, c-format
 msgid "skipped \"%s\": %s\n"
-msgstr "��%s����������%s\n"
+msgstr "“%s”已跳过：%s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
-msgstr "��������˽Կ�Ѵ���\n"
+msgstr "已跳过：私钥已存在\n"
 
-#: g10/skclist.c:186
-#, fuzzy
+#: g10/skclist.c:185
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
-msgstr "��%s��������������һ���� PGP ���ɵ� ElGamal ��Կ������ǩ�ֲ���ȫ��\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 "���μ�¼ %lu����� %d��д��ʧ�ܣ�%s\n"
+msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
 
 #: g10/tdbdump.c:104
 #, c-format
@@ -5342,313 +5251,347 @@ msgid ""
 "# List of assigned trustvalues, created %s\n"
 "# (Use \"gpg --import-ownertrust\" to restore them)\n"
 msgstr ""
-"# ��ָ�������ζȵ��嵥�������� %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��ʱ������%s\n"
+msgstr "‘%s’中出错：%s\n"
 
 #: g10/tdbdump.c:159
-#, fuzzy
 msgid "line too long"
-msgstr "��̫��\n"
+msgstr "列太长"
 
 #: g10/tdbdump.c:167
 msgid "colon missing"
-msgstr ""
+msgstr "冒号缺失"
 
 #: g10/tdbdump.c:173
-#, fuzzy
 msgid "invalid fingerprint"
-msgstr "������Ч��ָ��\n"
+msgstr "指纹无效"
 
 #: g10/tdbdump.c:178
-#, fuzzy
 msgid "ownertrust value missing"
-msgstr "�������ζ�"
+msgstr "没有信任度"
 
 #: g10/tdbdump.c:214
-#, fuzzy, c-format
+#, c-format
 msgid "error finding trust record in `%s': %s\n"
-msgstr "Ѱ�����ζȼ�¼ʱ������%s\n"
+msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
 #: g10/tdbdump.c:218
-#, fuzzy, c-format
+#, c-format
 msgid "read error in `%s': %s\n"
-msgstr "��ȡ����%s\n"
+msgstr "读取‘%s’错误：%s\n"
 
 #: g10/tdbdump.c:227 g10/trustdb.c:380
 #, c-format
 msgid "trustdb: sync failed: %s\n"
-msgstr "���ζ����ݿ⣺ͬ��ʧ�ܣ�%s\n"
+msgstr "信任度数据库：同步失败：%s\n"
 
 #: g10/tdbio.c:128 g10/tdbio.c:1440
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
-msgstr "���ζ����ݿ��¼ %lu����������ʧ�ܣ�%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 "���ζ����ݿ��¼ %lu��д��ʧ�� (n=%d): %s\n"
+msgstr "信任度数据库记录 %lu：写入失败 (n=%d): %s\n"
 
 #: g10/tdbio.c:244
 msgid "trustdb transaction too large\n"
-msgstr "���ζ����ݿ⴦��������\n"
+msgstr "信任度数据库处理量过大\n"
 
 #: g10/tdbio.c:497
-#, fuzzy, c-format
+#, c-format
 msgid "can't access `%s': %s\n"
-msgstr "�޷��رա�%s����%s\n"
+msgstr "无法存取‘%s’：%s\n"
 
 #: g10/tdbio.c:512
 #, c-format
 msgid "%s: directory does not exist!\n"
-msgstr "%s��Ŀ¼�����ڣ�\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 "�޷�������%s����%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 "�޷��򿪡�%s��\n"
+msgstr "无法锁定‘%s’\n"
 
 #: g10/tdbio.c:550
 #, c-format
 msgid "%s: failed to create version record: %s"
-msgstr "%s�������汾��¼ʧ�ܣ�%s"
+msgstr "%s：建立版本记录失败：%s"
 
 #: g10/tdbio.c:554
 #, c-format
 msgid "%s: invalid trustdb created\n"
-msgstr "%s����������Ч�����ζ����ݿ�\n"
+msgstr "%s：建立了无效的信任度数据库\n"
 
 #: g10/tdbio.c:557
 #, c-format
 msgid "%s: trustdb created\n"
-msgstr "%s�����������ζ����ݿ�\n"
+msgstr "%s：建立了信任度数据库\n"
 
 #: g10/tdbio.c:597
 msgid "NOTE: trustdb not writable\n"
-msgstr "ע�⣺���ζ����ݿⲻ��д��\n"
+msgstr "注意：信任度数据库不可写入\n"
 
 #: g10/tdbio.c:614
 #, c-format
 msgid "%s: invalid trustdb\n"
-msgstr "%s����Ч�����ζ����ݿ�\n"
+msgstr "%s：无效的信任度数据库\n"
 
 #: g10/tdbio.c:646
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
-msgstr "%s������ɢ�б�ʧ�ܣ�%s\n"
+msgstr "%s：建立散列表失败：%s\n"
 
 #: g10/tdbio.c:654
 #, c-format
 msgid "%s: error updating version record: %s\n"
-msgstr "%s�����°汾��¼ʱ������ %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����ȡ�汾��¼ʱ������ %s\n"
+msgstr "%s：读取版本记录时出错： %s\n"
 
 #: g10/tdbio.c:730
 #, c-format
 msgid "%s: error writing version record: %s\n"
-msgstr "%s��д��汾��¼ʱ������%s\n"
+msgstr "%s：写入版本记录时出错：%s\n"
 
 #: g10/tdbio.c:1169
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
-msgstr "���ζ����ݿ⣺��������ʧ�ܣ�%s\n"
+msgstr "信任度数据库：本地搜索失败：%s\n"
 
 #: g10/tdbio.c:1177
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
-msgstr "���ζ����ݿ⣺��ȡʧ��(n=%d)��%s\n"
+msgstr "信任度数据库：读取失败(n=%d)：%s\n"
 
 #: g10/tdbio.c:1198
 #, c-format
 msgid "%s: not a trustdb file\n"
-msgstr "%s������һ�����ζ����ݿ��ļ�\n"
+msgstr "%s：不是一个信任度数据库文件\n"
 
 #: g10/tdbio.c:1216
 #, c-format
 msgid "%s: version record with recnum %lu\n"
-msgstr "%s����¼���Ϊ%lu�İ汾��¼\n"
+msgstr "%s：记录编号为%lu的版本记录\n"
 
 #: g10/tdbio.c:1221
 #, c-format
 msgid "%s: invalid file version %d\n"
-msgstr "%s����Ч���ļ��汾%d\n"
+msgstr "%s：无效的文件版本%d\n"
 
 #: g10/tdbio.c:1406
 #, c-format
 msgid "%s: error reading free record: %s\n"
-msgstr "%s����ȡ���ɼ�¼ʱ������%s\n"
+msgstr "%s：读取自由记录时出错：%s\n"
 
 #: g10/tdbio.c:1414
 #, c-format
 msgid "%s: error writing dir record: %s\n"
-msgstr "%s��д��Ŀ¼��¼ʱ������%s\n"
+msgstr "%s：写入目录记录时出错：%s\n"
 
 #: g10/tdbio.c:1424
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
-msgstr "%s����¼����ʱʧ�ܣ�%s\n"
+msgstr "%s：记录归零时失败：%s\n"
 
 #: g10/tdbio.c:1454
 #, c-format
 msgid "%s: failed to append a record: %s\n"
-msgstr "%s�����Ӽ�¼ʱʧ�ܣ�%s\n"
+msgstr "%s：附加记录时失败：%s\n"
 
 #: g10/tdbio.c:1499
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
-msgstr "���ζ����ݿ����𻵣���ִ�С�gpg --fix-trustdb����\n"
+msgstr "信任度数据库已损坏；请执行“gpg --fix-trustdb”。\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
-msgstr "�޷��������� %d �ַ����ı���\n"
+msgstr "无法处理长于 %d 字符的文本行\n"
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
-msgstr "�����г��ȳ��� %d �ַ�\n"
+msgstr "输入行长度超过 %d 字符\n"
 
 #: g10/trustdb.c:226
 #, c-format
 msgid "`%s' is not a valid long keyID\n"
-msgstr "��%s������һ����Ч�ij�ʽԿ�׺�\n"
+msgstr "‘%s’不是一个有效的长式钥匙号\n"
 
 #: g10/trustdb.c:257
-#, fuzzy, c-format
+#, c-format
 msgid "key %s: accepted as trusted key\n"
-msgstr "��Կ %08lX�������Σ��ѽ���\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 �����ζ����ݿ����ظ�����\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�������ε���Կû�й�Կ����������\n"
+msgstr "密钥 %s：受信任的密钥没有公钥――已跳过\n"
 
 #: g10/trustdb.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "key %s marked as ultimately trusted\n"
-msgstr "��Կ�ѱ���dzɾ������Ρ�\n"
+msgstr "密钥 %s 被标记为绝对信任\n"
 
 #: g10/trustdb.c:344
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
-msgstr "���μ�¼ %lu��������� %d����ȡʧ�ܣ�%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 "���μ�¼ %lu ���������������� %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 "使用 %s 信任模型\n"
+
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:501
-msgid "undefined"
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "已吊销"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "已过期"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "未知"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+#, fuzzy
+msgid "[marginal]"
+msgstr "勉强"
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:515
 #, fuzzy
+msgid "[ultimate]"
+msgstr "绝对"
+
+#: g10/trustdb.c:530
+msgid "undefined"
+msgstr "未定义"
+
+#: g10/trustdb.c:531
 msgid "never"
-msgstr "��������"
+msgstr "从不"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
-msgstr ""
+msgstr "勉强"
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
-msgstr ""
+msgstr "完全"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
-msgstr ""
+msgstr "绝对"
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
-msgstr "����Ҫ������ζ����ݿ�\n"
+msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
-msgstr "�´����ζ����ݿ��齫�� %s ����\n"
+msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:560
-#, fuzzy, c-format
+#: g10/trustdb.c:589
+#, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
-msgstr "����Ҫ������ζ����ݿ�\n"
+msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:575
-#, fuzzy, c-format
+#: g10/trustdb.c:604
+#, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
-msgstr "����Ҫ������ζ����ݿ�\n"
+msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
-#, fuzzy, c-format
+#: g10/trustdb.c:822 g10/trustdb.c:1260
+#, c-format
 msgid "public key %s not found: %s\n"
-msgstr "��Կ %08lX δ���ҵ���%s\n"
+msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
-msgstr "��ִ��һ�� --check-trustdb\n"
+msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
-msgstr "���ڼ�����ζ����ݿ�\n"
+msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
-msgstr "�Ѿ������� %d ����Կ(�����ѽ���� %d �ݵ���Ч��)\n"
+msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
-msgstr "û���ҵ��κξ������ε���Կ\n"
+msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:1934
-#, fuzzy, c-format
+#: g10/trustdb.c:1963
+#, c-format
 msgid "public key of ultimately trusted key %s not found\n"
-msgstr "�������ε���Կ %08lX �Ĺ�Կδ���ҵ�\n"
+msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
-msgstr ""
+msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
+"深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2118
-#, fuzzy, c-format
+#: g10/trustdb.c:2147
+#, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
-msgstr "���μ�¼ %lu����� %d��д��ʧ�ܣ�%s\n"
+msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
 
 #: g10/verify.c:116
 msgid ""
@@ -5656,250 +5599,248 @@ msgid ""
 "Please remember that the signature file (.sig or .asc)\n"
 "should be the first file given on the command line.\n"
 msgstr ""
-"ǩ���޷�����֤��\n"
-"���סǩ���ļ�(.sig��.asc)\n"
-"Ӧ�������������и����ĵ�һ���ļ���\n"
+"签字无法被验证。\n"
+"请记住签字文件(.sig或.asc)\n"
+"应该是在命令行中给定的第一个文件。\n"
 
 #: g10/verify.c:189
 #, c-format
 msgid "input line %u too long or missing LF\n"
-msgstr "������ %u ̫��������ĩ�Ļ��з� LF ��ʧ\n"
+msgstr "输入行 %u 太长或者行末的换行符 LF 遗失\n"
 
 #: util/errors.c:54
 msgid "general error"
-msgstr "�������"
+msgstr "常规错误"
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "δ֪�İ�����"
+msgstr "未知的包类型"
 
 #: util/errors.c:56
 msgid "unknown version"
-msgstr "δ֪�İ汾"
+msgstr "未知的版本"
 
 #: util/errors.c:57
 msgid "unknown pubkey algorithm"
-msgstr "δ֪�Ĺ�Կ�㷨"
+msgstr "未知的公钥算法"
 
 #: util/errors.c:58
 msgid "unknown digest algorithm"
-msgstr "δ֪��ɢ���㷨"
+msgstr "未知的散列算法"
 
 #: util/errors.c:59
 msgid "bad public key"
-msgstr "��Կ�Ѿ���"
+msgstr "公钥已经损坏"
 
 #: util/errors.c:60
 msgid "bad secret key"
-msgstr "˽Կ�Ѿ���"
+msgstr "私钥已经损坏"
 
 #: util/errors.c:61
 msgid "bad signature"
-msgstr "ǩ���Ѿ���"
+msgstr "签字已经损坏"
 
 #: util/errors.c:62
 msgid "checksum error"
-msgstr "У��ʹ���"
+msgstr "校验和错误"
 
 #: util/errors.c:63
 msgid "bad passphrase"
-msgstr "���������"
+msgstr "错误的密码"
 
 #: util/errors.c:64
 msgid "public key not found"
-msgstr "�Ҳ�����Կ"
+msgstr "找不到公钥"
 
 #: util/errors.c:65
 msgid "unknown cipher algorithm"
-msgstr "δ֪�ĶԳƼ����㷨"
+msgstr "未知的对称加密算法"
 
 #: util/errors.c:66
 msgid "can't open the keyring"
-msgstr "�޷���Կ�׻�"
+msgstr "无法打开钥匙环"
 
 #: util/errors.c:67
 msgid "invalid packet"
-msgstr "����"
+msgstr "无效包"
 
 #: util/errors.c:68
 msgid "invalid armor"
-msgstr "��Ч�� ASCII ��װ��ʽ"
+msgstr "无效的 ASCII 封装格式"
 
 #: util/errors.c:69
 msgid "no such user id"
-msgstr "û������û���ʶ"
+msgstr "没有这个用户标识"
 
 #: util/errors.c:70
 msgid "secret key not available"
-msgstr "˽Կ������"
+msgstr "私钥不可用"
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "ʹ���˴����˽Կ"
+msgstr "使用了错误的私钥"
 
 #: util/errors.c:72
 msgid "not supported"
-msgstr "δ��֧��"
+msgstr "未被支持"
 
 #: util/errors.c:73
 msgid "bad key"
-msgstr "��Կ����"
+msgstr "密钥已损坏"
 
 #: util/errors.c:74
 msgid "file read error"
-msgstr "�ļ���ȡ����"
+msgstr "文件读取错误"
 
 #: util/errors.c:75
 msgid "file write error"
-msgstr "�ļ�д�����"
+msgstr "文件写入错误"
 
 #: util/errors.c:76
 msgid "unknown compress algorithm"
-msgstr "δ֪��ѹ���㷨"
+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 "��������"
+msgstr "无效的密码"
 
 #: util/errors.c:80
 msgid "unimplemented pubkey algorithm"
-msgstr "��δʵ�ֵĹ�Կ�㷨"
+msgstr "尚未实现的公钥算法"
 
 #: util/errors.c:81
 msgid "unimplemented cipher algorithm"
-msgstr "��δʵ�ֵĶԳƼ����㷨"
+msgstr "尚未实现的对称加密算法"
 
 #: util/errors.c:82
 msgid "unknown signature class"
-msgstr "δ֪��ǩ�ֵȼ�"
+msgstr "未知的签字等级"
 
 #: util/errors.c:83
 msgid "trust database error"
-msgstr "���ζ����ݿ����"
+msgstr "信任度数据库错误"
 
 #: util/errors.c:84
 msgid "bad MPI"
-msgstr "�𻵵Ķྫ������(MPI)"
+msgstr "损坏的多精度整数(MPI)"
 
 #: util/errors.c:85
 msgid "resource limit"
-msgstr "��Դ����"
+msgstr "资源限制"
 
 #: util/errors.c:86
 msgid "invalid keyring"
-msgstr "��Ч��Կ�׻�"
+msgstr "无效的钥匙环"
 
 #: util/errors.c:87
 msgid "bad certificate"
-msgstr "֤������"
+msgstr "证书已损坏"
 
 #: util/errors.c:88
 msgid "malformed user id"
-msgstr "����������û���ʶ"
+msgstr "被变造过的用户标识"
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "�ļ��رմ���"
+msgstr "文件关闭错误"
 
 #: util/errors.c:90
 msgid "file rename error"
-msgstr "�ļ�����������"
+msgstr "文件重命名错误"
 
 #: util/errors.c:91
 msgid "file delete error"
-msgstr "�ļ�ɾ������"
+msgstr "文件删除错误"
 
 #: util/errors.c:92
 msgid "unexpected data"
-msgstr "δԤ�ڵ�����"
+msgstr "未预期的数据"
 
 #: util/errors.c:93
 msgid "timestamp conflict"
-msgstr "ʱ�����ì��"
+msgstr "时间戳有矛盾"
 
 #: util/errors.c:94
 msgid "unusable pubkey algorithm"
-msgstr "�޷�ʹ�õĹ�Կ�㷨"
+msgstr "无法使用的公钥算法"
 
 #: util/errors.c:95
 msgid "file exists"
-msgstr "�ļ��Ѵ���"
+msgstr "文件已存在"
 
 #: util/errors.c:96
 msgid "weak key"
-msgstr "����Կ"
+msgstr "弱密钥"
 
 #: util/errors.c:97
 msgid "invalid argument"
-msgstr "���IJ���"
+msgstr "无效的参数"
 
 #: util/errors.c:98
 msgid "bad URI"
-msgstr "URI ����"
+msgstr "URI 已损坏"
 
 #: util/errors.c:99
 msgid "unsupported URI"
-msgstr "δ��֧�ֵ� URI"
+msgstr "未被支持的 URI"
 
 #: util/errors.c:100
 msgid "network error"
-msgstr "�������"
+msgstr "网络错误"
 
 #: util/errors.c:102
 msgid "not encrypted"
-msgstr "�����"
+msgstr "未被加密"
 
 #: util/errors.c:103
 msgid "not processed"
-msgstr "�����"
+msgstr "未被处理"
 
 #: util/errors.c:105
 msgid "unusable public key"
-msgstr "�����õĹ�Կ"
+msgstr "不可用的公钥"
 
 #: util/errors.c:106
 msgid "unusable secret key"
-msgstr "�����õ�˽Կ"
+msgstr "不可用的私钥"
 
 #: util/errors.c:107
 msgid "keyserver error"
-msgstr "��Կ����������"
+msgstr "公钥服务器错误"
 
 #: util/errors.c:108
-#, fuzzy
 msgid "canceled"
-msgstr "ȡ��"
+msgstr "已取消"
 
 #: util/errors.c:109
-#, fuzzy
 msgid "no card"
-msgstr "�����"
+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 "�������Ǹ�����ȱ��(%s:%d:%s)\n"
+msgstr "……这是个程序缺陷(%s:%d:%s)\n"
 
 #: util/logger.c:229
 #, c-format
 msgid "you found a bug ... (%s:%d)\n"
-msgstr "���ҵ�һ������ȱ���ˡ���(%s:%d)\n"
+msgstr "您找到一个程序缺陷了……(%s:%d)\n"
 
 #: util/miscutil.c:307 util/miscutil.c:344
 msgid "yes"
@@ -5923,485 +5864,84 @@ msgstr "qQ"
 
 #: util/miscutil.c:384
 msgid "okay|okay"
-msgstr ""
+msgstr "okay|ok"
 
 #: util/miscutil.c:386
 msgid "cancel|cancel"
-msgstr ""
+msgstr "cancel|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 "���棺����ʹ�ò���ȫ���ڴ棡\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 �Ի�ø���ϸ����Ϣ\n"
+msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
 
 #: util/secmem.c:340
 msgid "operation is not possible without initialized secure memory\n"
-msgstr "��ȫ�ڴ�δ��ʼ�������ܽ��в���\n"
+msgstr "安全内存未初始化，不能进行操作\n"
 
 #: util/secmem.c:341
 msgid "(you may have used the wrong program for this task)\n"
-msgstr "(������ʹ���˴���ij�������ɴ�������)\n"
-
-#~ msgid "sorry, can't do this in batch mode\n"
-#~ msgstr "��Ǹ����������ģʽ���޷���ɴ˲���\n"
-
-#~ msgid "key `%s' not found: %s\n"
-#~ msgstr "�Ҳ�����%s����Կ��%s\n"
-
-#, fuzzy
-#~ msgid "can't create file `%s': %s\n"
-#~ msgstr "�޷�������%s����%s\n"
-
-#, fuzzy
-#~ msgid "can't open file `%s': %s\n"
-#~ msgstr "�޷����ļ���%s\n"
-
-#, fuzzy
-#~ msgid "          \""
-#~ msgstr "                �༴ \""
+msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
-#~ msgid " i = please show me more information\n"
-#~ msgstr " i = ������Ҹ�����Ϣ\n"
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "‘%s’散列算法在本发行版本中只读\n"
 
-#~ msgid "key %08lX: key has been revoked!\n"
-#~ msgstr "��Կ %08lX���Ѿ��������ˣ�\n"
+#~ msgid "[%8.8s] "
+#~ msgstr "[%4.4s]"
 
-#~ msgid "key %08lX: subkey has been revoked!\n"
-#~ msgstr "��Կ %08lX����Կ�Ѿ��������ˣ�\n"
-
-#~ msgid "%08lX: key has expired\n"
-#~ msgstr "%08lX: ��Կ�Ѿ�������\n"
-
-#~ msgid "%08lX: We do NOT trust this key\n"
-#~ msgstr "%08lX�����Dz����������Կ\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (����ǩ�ּ�����)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (������ǩ��)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (sign and auth)\n"
-#~ msgstr "   (%d) RSA (����ǩ�ּ�����)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (�����ڼ���)\n"
-
-#, fuzzy
-#~ msgid "  (%d) RSA (sign, encrypt and auth)\n"
-#~ msgstr "   (%d) RSA (����ǩ�ּ�����)\n"
-
-#~ msgid "%s: can't open: %s\n"
-#~ msgstr "%s���޷��򿪣�%s\n"
-
-#~ msgid "%s: WARNING: empty file\n"
-#~ msgstr "%s�����棺���ļ�\n"
-
-#~ msgid "can't open %s: %s\n"
-#~ msgstr "�޷��� %s��%s\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust marginally\n"
-#~ msgstr " %d = ����ǿ����\n"
-
-#, fuzzy
-#~ msgid "   (%d) I trust fully\n"
-#~ msgstr " %d = ����ȫ����\n"
-
-#, fuzzy
-#~ msgid "expires"
-#~ msgstr "expire"
-
-#, fuzzy
 #~ msgid ""
-#~ "\"\n"
-#~ "locally signed with your key %s at %s\n"
+#~ "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 ""
-#~ "��\n"
-#~ "�Ѿ�ʹ��������Կ %08lX �� %s ���ӱ���ǩ��\n"
-
-#, fuzzy
-#~ msgid "   signed by %s on %s%s\n"
-#~ msgstr "   �� %08lX �� %s%s ����ǩ��\n"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s���޷���ȡ��%s\n"
-
-#~ msgid "%s: can't create lock\n"
-#~ msgstr "%s���޷�����\n"
-
-#~ msgid "%s: can't make lock\n"
-#~ msgstr "%s���޷�����\n"
-
-#~ msgid "%s: can't create: %s\n"
-#~ msgstr "%s���޷�������%s\n"
-
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s���޷�����Ŀ¼��%s\n"
-
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "������������Ҫʹ����ѱ������˵���Կ����ش�yes����"
-
-#~ msgid "Unable to open photo \"%s\": %s\n"
-#~ msgstr "�޷�����Ƭ��%s����%s\n"
-
-#~ msgid "can't open file: %s\n"
-#~ msgstr "�޷����ļ���%s\n"
-
-#~ msgid "error: missing colon\n"
-#~ msgstr "����ð��ȱ©\n"
-
-#~ msgid "error: no ownertrust value\n"
-#~ msgstr "����û�����ζ�\n"
-
-#~ msgid " (main key ID %08lX)"
-#~ msgstr "(��Կ�׺� %08lX)"
-
-#~ msgid "rev! subkey has been revoked: %s\n"
-#~ msgstr "rev! ��Կ�Ѿ���������%s\n"
-
-#~ msgid "rev- faked revocation found\n"
-#~ msgstr "rev- ����α��ĵ���\n"
-
-#~ msgid "rev? problem checking revocation: %s\n"
-#~ msgstr "rev? ������ʱ�������⣺%s\n"
-
-#~ msgid "[revoked] "
-#~ msgstr "[�ѵ���]"
-
-#~ msgid "[expired] "
-#~ msgstr "[�ѹ���]"
-
-#  of subkey
-#, fuzzy
-#~ msgid " [expired: %s]"
-#~ msgstr " [��������%s]"
-
-#  of subkey
-#~ msgid " [expires: %s]"
-#~ msgstr " [��������%s]"
-
-#, fuzzy
-#~ msgid " [revoked: %s]"
-#~ msgstr "[�ѵ���]"
-
-#~ msgid "can't create %s: %s\n"
-#~ msgstr "�޷����� %s��%s\n"
-
-#~ msgid ""
-#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
-#~ msgstr "���棺ɢ���㷨��%s�������� OpenPGP ��һ���֡���Ҫʹ�ã�����Ը���\n"
-
-#~ msgid "|[files]|encrypt files"
-#~ msgstr "|[�ļ���]|�����ļ�"
-
-#~ msgid "store only"
-#~ msgstr "������"
-
-#~ msgid "|[files]|decrypt files"
-#~ msgstr "|[�ļ���]|�����ļ�"
-
-#~ msgid "sign a key non-revocably"
-#~ msgstr "Ϊij����Կ���Ӳ��ɵ�����ǩ��"
-
-#~ msgid "sign a key locally and non-revocably"
-#~ msgstr "Ϊij����Կ���Ӳ��ɵ����ı���ǩ��"
-
-#~ msgid "list only the sequence of packets"
-#~ msgstr "���������"
-
-#~ msgid "export the ownertrust values"
-#~ msgstr "�������ζ�"
-
-#~ msgid "unattended trust database update"
-#~ msgstr "���ܸ�Ԥ�ظ������ζ����ݿ�"
-
-#~ msgid "fix a corrupted trust database"
-#~ msgstr "�޸�ij�����𻵵����ζ����ݿ�"
-
-#~ msgid "De-Armor a file or stdin"
-#~ msgstr "Ϊ�ļ����׼����⿪ ASCII ��װ"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "Ϊ�ļ����׼������� ASCII ��װ"
-
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr "|ij��|����ij�ס�ѡΪĬ�ϵ��ռ���"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "��Ĭ�ϵ���Կ����Ĭ�ϵ��ռ���"
-
-#~ msgid "don't use the terminal at all"
-#~ msgstr "��ȫ��Ҫʹ���ն�"
-
-#~ msgid "force v3 signatures"
-#~ msgstr "ǿ��ʹ�� v3 ǩ��"
+#~ "将要生成一副新的%s密钥对。\n"
+#~ "        最小的密钥尺寸是  768 位\n"
+#~ "        默认的密钥尺寸是 1024 位\n"
+#~ "    推荐的最大密钥尺寸是 2048 位\n"
 
-#~ msgid "do not force v3 signatures"
-#~ msgstr "��Ҫǿ��ʹ�� v3 ǩ��"
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA 的密钥尺寸只能介于 512 和 1024 之间\n"
 
-#~ msgid "force v4 key signatures"
-#~ msgstr "ǿ��ʹ�� v4 ��Կǩ��"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "密钥尺寸太小：RSA 密钥尺寸至少要有 1024。\n"
 
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "��Ҫǿ��ʹ�� v4 ��Կǩ��"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "密钥尺寸太小；至少要有 768。\n"
 
-#~ msgid "always use a MDC for encryption"
-#~ msgstr "����ʱ��ʹ�ñ䶯�����"
-
-#~ msgid "never use a MDC for encryption"
-#~ msgstr "����ʱ��Զ��ʹ�ñ䶯�����"
-
-#~ msgid "use the gpg-agent"
-#~ msgstr "ʹ�� gpg-agent ��������"
-
-#~ msgid "batch mode: never ask"
-#~ msgstr "������ģʽ����Զ��ѯ��"
-
-#~ msgid "assume yes on most questions"
-#~ msgstr "�ٶ����������Ļش�Ϊ���ǡ�"
-
-#~ msgid "assume no on most questions"
-#~ msgstr "�ٶ����������Ļش�Ϊ����"
-
-#~ msgid "add this keyring to the list of keyrings"
-#~ msgstr "�����Կ�׻��ӽ�Կ�׻��嵥��"
-
-#~ msgid "add this secret keyring to the list"
-#~ msgstr "�����˽ԿԿ�׻��ӽ��嵥��"
-
-#~ msgid "show which keyring a listed key is on"
-#~ msgstr "��ʾ���г�����Կ����һ��Կ�׻���"
-
-#~ msgid "|NAME|use NAME as default secret key"
-#~ msgstr "|ij��|����ij�ס���ΪĬ��˽Կ"
-
-#~ msgid "|HOST|use this keyserver to lookup keys"
-#~ msgstr "|������|ʹ�������Կ��������Ѱ����Կ"
-
-#~ msgid "|NAME|set terminal charset to NAME"
-#~ msgstr "|�ַ�����|�趨�ն�ʹ�õ��ַ���"
-
-#~ msgid "read options from file"
-#~ msgstr "���ļ���ȡѡ��"
-
-#~ msgid "|[file]|write status info to file"
-#~ msgstr "|[�ļ���]|��״̬��Ϣд���ļ�"
-
-#~ msgid "|KEYID|ultimately trust this key"
-#~ msgstr "|Կ�׺�|�������δ���Կ"
-
-#~ msgid "|FILE|load extension module FILE"
-#~ msgstr "|�ļ���|������չģ��"
-
-#~ msgid "emulate the mode described in RFC1991"
-#~ msgstr "���� RFC1991 ����������ģʽ"
-
-#~ msgid "set all packet, cipher and digest options to OpenPGP behavior"
-#~ msgstr "�������ܺ�ɢ���㷨��ѡ�����Ϊ OpenPGP ��ʽ"
-
-#~ msgid "set all packet, cipher and digest options to PGP 2.x behavior"
-#~ msgstr "�������ܺ�ɢ���㷨��ѡ�����Ϊ PGP 2.x ��ʽ"
-
-#~ msgid "|N|use passphrase mode N"
-#~ msgstr "|N|ʹ��ģʽ N ������"
-
-#~ msgid "|NAME|use message digest algorithm NAME for passphrases"
-#~ msgstr "|�㷨��|ָ������ʹ�õı���ɢ���㷨"
-
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|�㷨��|ָ������ʹ�õĶԳƼ����㷨"
-
-#~ msgid "|NAME|use cipher algorithm NAME"
-#~ msgstr "|�㷨��|ָ��ʹ�õĶԳƼ����㷨"
-
-#~ msgid "|NAME|use message digest algorithm NAME"
-#~ msgstr "|�㷨��|ָ��ʹ�õı���ɢ���㷨"
-
-#~ msgid "|N|use compress algorithm N"
-#~ msgstr "|N|ʹ�õ� N ��ѹ���㷨"
-
-#~ msgid "throw keyid field of encrypted packets"
-#~ msgstr "�����ռ���Կ�׺ż�����ܰ���"
-
-#~ msgid "Show Photo IDs"
-#~ msgstr "��ʾ��Ƭ��ʶ"
-
-#~ msgid "Don't show Photo IDs"
-#~ msgstr "����ʾ��Ƭ��ʶ"
-
-#~ msgid "Set command line to view Photo IDs"
-#~ msgstr "�趨�鿴��Ƭ��ʶʱʹ�õ�������"
-
-#~ msgid "compress algorithm `%s' is read-only in this release\n"
-#~ msgstr "��%s��ѹ���㷨�ڱ����а汾��ֻ��\n"
-
-#~ msgid "compress algorithm must be in range %d..%d\n"
-#~ msgstr "ѹ���㷨һ��Ҫ���� %d �� %d ֮��\n"
+#~ msgid "keysize too large; %d is largest value allowed.\n"
+#~ msgstr "密钥尺寸太大；最大只能够用到 %d。\n"
 
 #~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
 #~ msgstr ""
-#~ "%08lX: �޷�ȷ�������Կ�Ƿ���������������Ƶij�����\n"
-#~ "������Կ�Ծɱ�������\n"
+#~ "不建议使用尺寸大于 2048 的密钥，\n"
+#~ "因为计算真的会花去很多时间！\n"
 
-#~ msgid "preference %c%lu is not valid\n"
-#~ msgstr "��ѡ�� %c%lu ��Ч\n"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "��Կ %08lX������һ�� rfc2440 ��Կ����������\n"
+#~ msgid "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "您确定要用这个密钥尺寸吗？(y/N)"
 
 #~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\n"
-#~ msgstr "ע�⣺��⵽ Elgamal ��Կ�������������Կ���ܻ�����һ��ʱ��\n"
-
-#~ msgid " (default)"
-#~ msgstr " (Ĭ��)"
-
-#~ msgid "%s%c %4u%c/%08lX  created: %s expires: %s"
-#~ msgstr "%s%c %4u%c/%08lX �����ڣ�%s ��Ч����%s"
-
-#~ msgid "Notation: "
-#~ msgstr "��ǣ�"
-
-#~ msgid "Policy: "
-#~ msgstr "���ԣ�"
-
-#~ msgid "can't get key from keyserver: %s\n"
-#~ msgstr "�޷��ӹ�Կ������ȡ����Կ�� %s\n"
-
-#~ msgid "error sending to `%s': %s\n"
-#~ msgstr "�ϴ�����%s����ʱ��������%s\n"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "�ɹ��ϴ�����%s��(״̬ = %u)\n"
-
-#~ msgid "failed sending to `%s': status=%u\n"
-#~ msgstr "�ϴ�����%s��ʧ�ܣ�״̬ = %u\n"
-
-#~ msgid "this keyserver does not support --search-keys\n"
-#~ msgstr "�˹�Կ��������֧�� --search-keys\n"
-
-#~ msgid "can't search keyserver: %s\n"
-#~ msgstr "�޷���Ѱ��Կ��������%s\n"
-
-#~ msgid ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\n"
-#~ msgstr "��Կ %08lX�������� PGP ������ ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu second in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr "��Կ %08lX ���� %lu ����δ�����ɵ�(ʱ��Ť����ʱ�ӵ�����)\n"
-
-#~ msgid ""
-#~ "key %08lX has been created %lu seconds in future (time warp or clock "
-#~ "problem)\n"
-#~ msgstr "��Կ %08lX ���� %lu ����δ�����ɵ�(ʱ��Ť����ʱ�ӵ�����)\n"
-
-#~ msgid "key %08lX marked as ultimately trusted\n"
-#~ msgstr "��Կ %08lX �����Ϊ��������\n"
-
-#~ msgid "signature from Elgamal signing key %08lX to %08lX skipped\n"
-#~ msgstr "�� Elgamal ǩ����Կ %08lX Ϊ %08lX ����ǩ�ֱ�����\n"
-
-# FIXME: I added the format string at the end to avoid a format string vulnerability.  This should be fixed properly of course - wk
-#~ msgid "signature from %08lX to Elgamal signing key %08lX skipped\n"
-#~ msgstr "�� %08lX Ϊ Elgamal ǩ����Կ����ǩ�ֱ����� (%08lX)\n"
-
-#~ msgid "checking at depth %d signed=%d ot(-/q/n/m/f/u)=%d/%d/%d/%d/%d/%d\n"
-#~ msgstr "������Ϊ %d��ǩ��=%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"
-#~ "\n"
-#~ "DSA (�༴DSS)��һ��ֻ������ǩ�ֵ�����ǩ���㷨����Ҳ���Ƽ�ʹ�õ��㷨��\n"
-#~ "��Ϊ��֤ DSA ǩ��Զ�� ElGamal ǩ�ֿ졣\n"
-#~ "\n"
-#~ "ElGamal ��һ�ּȿ�����ǩ�ֺ�Ҳ�����ڼ��ܵ��㷨��\n"
-#~ "OpenPGP �������㷨���ֳ�������ʽ��ֻ�����ڼ��ܵģ�����ǩ�ּ����ܵģ�\n"
-#~ "��������ԭ��һ�£���Ϊ���ɰ�ȫ������ǩ�ֵ���Կ�����������ض��ķ���\n"
-#~ "ѡ��һЩ������������ʵ���˴˹��ܣ�������ʵ�� OpenPGP �ij�����ܲ���\n"
-#~ "ʶ�����ּ��ǩ�ּ����ܹ��ܵ���ʽ��\n"
-#~ "\n"
-#~ "��һ����Կ(����Կ)����Ҫ�߱�ǩ�ֵ����������\n"
-#~ "ֻ�����ڼ��ܵ� ElGamal ��Կ������˵����޷�ʹ�á�"
-
-#~ 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."
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
 #~ msgstr ""
-#~ "��Ȼ�� RFC2440 �ж�������Щ��Կ���������Ƽ��������ǣ�\n"
-#~ "��Ϊ���Dz��������еij�����֧�֣����������������ɵ�ǩ��\n"
-#~ "ʮ���Ӵ���֤�������ǻ�����"
+#~ "好吧，但是请记住，您的屏幕和键盘所发出的无线电波也是可以被侦测的！\n"
 
-#~ msgid "%lu keys so far checked (%lu signatures)\n"
-#~ msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
-
-#~ msgid "key incomplete\n"
-#~ msgstr "��Կ������\n"
-
-#~ msgid "key %08lX incomplete\n"
-#~ msgstr "��Կ %08lX ������\n"
-
-#~ msgid "   (%d) ElGamal (sign and encrypt)\n"
-#~ msgstr "   (%d) ElGamal (����ǩ�ּ�����)\n"
+#~ msgid "Experimental algorithms should not be used!\n"
+#~ msgstr "不应使用实验性的算法！\n"
 
 #~ 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 ""
-#~ "��ע�⣬ֻ�� GnuPG ��֧������㷨��������㷨���ɵ���Կ\n"
-#~ "�޷��� PGP ʹ���߻�ͨ��ͬʱ����㷨�dz�������\n"
-#~ "���ҿ���Ҳ���������㷨��ȫ��\n"
-
-#~ msgid "Create anyway? "
-#~ msgstr "������λ���Ҫ������ "
-
-#~ msgid "invalid symkey algorithm detected (%d)\n"
-#~ msgstr "��⵽��Ч�ĶԳƼ����㷨 (%d)\n"
-
-#~ msgid "this keyserver is not fully HKP compatible\n"
-#~ msgstr "�����Կ������������ȫ�� HKP ����\n"
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
+#~ msgstr "不推荐使用这个加密算法；请换用更符合标准的算法！\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5deedbb0f..25ac1883b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-28 10:59+0200\n"
+"POT-Creation-Date: 2004-12-10 20:16+0100\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -17,11 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=BIG5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cipher/md.c:137
-#, c-format
-msgid "digest algorithm `%s' is read-only in this release\n"
-msgstr "`%s' �K�n�t��k�b�o�����X����������Ū\n"
-
 #: cipher/primegen.c:120
 #, c-format
 msgid "can't gen prime with pbits=%u qbits=%u\n"
@@ -36,11 +31,12 @@ msgstr ""
 msgid "no entropy gathering module detected\n"
 msgstr "��������üƻ`���Ҳ�\n"
 
-#: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
-#: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
-#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
-#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: cipher/random.c:387 g10/card-util.c:613 g10/card-util.c:682
+#: g10/dearmor.c:60 g10/dearmor.c:109 g10/encode.c:181 g10/encode.c:488
+#: g10/g10.c:962 g10/g10.c:3227 g10/import.c:177 g10/keygen.c:2248
+#: 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"
@@ -73,9 +69,9 @@ msgstr "�L�kŪ�� `%s' �G %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
 
-#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
-#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
-#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
+#: 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
+#: 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"
@@ -128,90 +124,150 @@ msgstr ""
 "�H���줸�դ����h�C�Цh���@�Ǧ����S���Ʊ��A\n"
 "�o�˧@�~�t���ׯ�`�����h���üơI(�ٻݭn %d �줸��)\n"
 
-#: g10/app-openpgp.c:534
+#: g10/app-openpgp.c:539
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/app-openpgp.c:547
+#: g10/app-openpgp.c:552
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "���s�إ��_�Ͱ�֨����ѡG %s\n"
 
-#: g10/app-openpgp.c:732 g10/app-openpgp.c:821 g10/app-openpgp.c:1313
+#: g10/app-openpgp.c:776 g10/app-openpgp.c:868 g10/app-openpgp.c:1379
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:738 g10/app-openpgp.c:827 g10/app-openpgp.c:1319
+#: g10/app-openpgp.c:782 g10/app-openpgp.c:874 g10/app-openpgp.c:1385
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: g10/app-openpgp.c:747 g10/app-openpgp.c:761 g10/app-openpgp.c:837
-#: g10/app-openpgp.c:1328 g10/app-openpgp.c:1342
+#: 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
 msgid "verify CHV%d failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/app-openpgp.c:784
+#: g10/app-openpgp.c:828
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:801
+#: g10/app-openpgp.c:845
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:807
+#: g10/app-openpgp.c:851
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: g10/app-openpgp.c:814
+#: g10/app-openpgp.c:858
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#: g10/app-openpgp.c:818
-msgid "Admin PIN"
+#: g10/app-openpgp.c:865
+msgid "|A|Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|AN|New Admin PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1021
+msgid "|N|New PIN"
+msgstr ""
+
+#: g10/app-openpgp.c:1025
+#, fuzzy, c-format
+msgid "error getting new PIN: %s\n"
+msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
+
+#: g10/app-openpgp.c:1091 g10/app-openpgp.c:1233
+#, fuzzy
+msgid "error reading application data\n"
+msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
+
+#: g10/app-openpgp.c:1098 g10/app-openpgp.c:1240
+#, fuzzy
+msgid "error reading fingerprint DO\n"
+msgstr "%s: Ū���ۥѰO���ɿ��~�G %s\n"
+
+#: g10/app-openpgp.c:1107
+#, fuzzy
+msgid "key already exists\n"
+msgstr "`%s' �w�g�Q���Y�F\n"
+
+#: g10/app-openpgp.c:1111
+msgid "existing key will be replaced\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1113
+#, fuzzy
+msgid "generating new key\n"
+msgstr "���ͤ@���s�����_��"
+
+#: g10/app-openpgp.c:1123
+msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1301
+#: g10/app-openpgp.c:1138
+#, fuzzy
+msgid "generating key failed\n"
+msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
+
+#: g10/app-openpgp.c:1141
+#, fuzzy, c-format
+msgid "key generation completed (%d seconds)\n"
+msgstr "���ͪ��_���ѡG %s\n"
+
+#: g10/app-openpgp.c:1147 g10/app-openpgp.c:1878
+msgid "response does not contain the public key data\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1155 g10/app-openpgp.c:1886
+msgid "response does not contain the RSA modulus\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1165 g10/app-openpgp.c:1897
+msgid "response does not contain the RSA public exponent\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1198
+msgid "invalid structure of OpenPGP card (DO 0x93)\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1359
+#, c-format
+msgid "signatures created so far: %lu\n"
+msgstr ""
+
+#: g10/app-openpgp.c:1367
 #, c-format
 msgid "PIN [sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:1587 g10/app-openpgp.c:1597
+#: g10/app-openpgp.c:1653 g10/app-openpgp.c:1663
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
 
-#: g10/app-openpgp.c:1668
+#: g10/app-openpgp.c:1734
 #, fuzzy, c-format
 msgid "error getting serial number: %s\n"
 msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
 
-#: g10/app-openpgp.c:1763
+#: g10/app-openpgp.c:1829
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/app-openpgp.c:1805
+#: g10/app-openpgp.c:1871
 #, fuzzy
 msgid "reading the key failed\n"
 msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
 
-#: g10/app-openpgp.c:1812
-msgid "response does not contain the public key data\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1820
-msgid "response does not contain the RSA modulus\n"
-msgstr ""
-
-#: g10/app-openpgp.c:1831
-msgid "response does not contain the RSA public exponent\n"
-msgstr ""
-
 #: g10/armor.c:317
 #, c-format
 msgid "armor: %s\n"
@@ -297,15 +353,15 @@ msgstr "�L�k���Ψp�_"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
-#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#: g10/card-util.c:70 g10/card-util.c:1288 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2432 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "�L�k�b�妸�Ҧ������˰�\n"
 
-#: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
+#: 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:1361
+#: g10/keygen.c:1363
 msgid "Your selection? "
 msgstr "�p�n����@�ӡH "
 
@@ -313,141 +369,150 @@ msgstr "�p�n����@�ӡH "
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:376
+#: g10/card-util.c:378
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:377
+#: g10/card-util.c:379
 #, fuzzy
 msgid "unspecified"
 msgstr "�����w��]"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 #, fuzzy
 msgid "not forced"
 msgstr "���Q�B�z"
 
-#: g10/card-util.c:396
+#: g10/card-util.c:406
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:439
+#: g10/card-util.c:458
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:441
+#: g10/card-util.c:460
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:443
+#: g10/card-util.c:462
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:460
+#: g10/card-util.c:479
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:462
+#: g10/card-util.c:481
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:480
+#: g10/card-util.c:499
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:502
+#: g10/card-util.c:521
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�S���۹��������_�G %s\n"
 
-#: g10/card-util.c:510
+#: g10/card-util.c:529
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:603 g10/import.c:261
+#: g10/card-util.c:622 g10/card-util.c:691 g10/import.c:263
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Ū�� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/card-util.c:611
+#: g10/card-util.c:630
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:621
+#: g10/card-util.c:640
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:641
+#: g10/card-util.c:699
+msgid "Private DO data: "
+msgstr ""
+
+#: g10/card-util.c:709
+#, c-format
+msgid "Error: Private DO too long (limit is %d characters).\n"
+msgstr ""
+
+#: g10/card-util.c:729
 #, fuzzy
 msgid "Language preferences: "
 msgstr "��s�L�����n"
 
-#: g10/card-util.c:649
+#: g10/card-util.c:737
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "���n�]�w�r��̦��L�Ī��r��\n"
 
-#: g10/card-util.c:658
+#: g10/card-util.c:746
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���n�]�w�r��̦��L�Ī��r��\n"
 
-#: g10/card-util.c:679
+#: g10/card-util.c:767
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:693
+#: g10/card-util.c:781
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "���~�G�L�Ī�����\n"
 
-#: g10/card-util.c:714
+#: g10/card-util.c:802
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "��ܫ���"
 
-#: g10/card-util.c:737
+#: g10/card-util.c:825
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���~�G�L�Ī�����\n"
 
-#: g10/card-util.c:785
+#: g10/card-util.c:873
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/card-util.c:786
+#: g10/card-util.c:874
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�䤣�즳�Ī� OpenPGP ��ơC\n"
 
-#: g10/card-util.c:795
+#: g10/card-util.c:883
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/card-util.c:878
+#: g10/card-util.c:966
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:899 g10/card-util.c:908
+#: g10/card-util.c:987 g10/card-util.c:996
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:920
+#: g10/card-util.c:1008
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:929
+#: g10/card-util.c:1017
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -455,232 +520,254 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:968
+#: g10/card-util.c:1056
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�п�ܩp�n�ϥΪ����_�����G\n"
 
-#: g10/card-util.c:970 g10/card-util.c:1050
+#: g10/card-util.c:1058 g10/card-util.c:1138
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/card-util.c:971 g10/card-util.c:1052
+#: g10/card-util.c:1059 g10/card-util.c:1140
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (�ȯ�[�K��)\n"
 
-#: g10/card-util.c:972 g10/card-util.c:1054
+#: g10/card-util.c:1060 g10/card-util.c:1142
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:642
+#: g10/card-util.c:1076 g10/card-util.c:1158 g10/keyedit.c:907
+#: g10/keygen.c:1402 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�L�Ī���ܡC\n"
 
-#: g10/card-util.c:1047
+#: g10/card-util.c:1135
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�п�ܺM�P����]�G\n"
 
-#: g10/card-util.c:1082
+#: g10/card-util.c:1170
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������O�@�t��k\n"
 
-#: g10/card-util.c:1087
+#: g10/card-util.c:1175
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "�D�_���p�_�����S��k���ΡC\n"
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1180
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "�w���L�G�p�_�w�g�s�b\n"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245 util/miscutil.c:348
+#: g10/card-util.c:1250 g10/keyedit.c:1245 util/miscutil.c:348
 msgid "quit"
 msgstr "quit"
 
-#: g10/card-util.c:1162 g10/keyedit.c:1245
+#: g10/card-util.c:1250 g10/keyedit.c:1245
 msgid "quit this menu"
 msgstr "���}�o�ӿ��"
 
-#: g10/card-util.c:1163 g10/keyedit.c:1246
+#: g10/card-util.c:1251 g10/keyedit.c:1246
 msgid "q"
 msgstr "q"
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 msgid "admin"
 msgstr ""
 
-#: g10/card-util.c:1164
+#: g10/card-util.c:1252
 #, fuzzy
 msgid "show admin commands"
 msgstr "���O�����٬�\n"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "help"
 msgstr "help"
 
-#: g10/card-util.c:1165 g10/keyedit.c:1248
+#: g10/card-util.c:1253 g10/keyedit.c:1248
 msgid "show this help"
 msgstr "��ܳo���u�W����"
 
-#: g10/card-util.c:1167 g10/keyedit.c:1251
+#: g10/card-util.c:1255 g10/keyedit.c:1251
 msgid "list"
 msgstr "list"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1255
 #, fuzzy
 msgid "list all available data"
 msgstr "�S���i������"
 
-#: g10/card-util.c:1168 g10/keyedit.c:1252
+#: g10/card-util.c:1256 g10/keyedit.c:1252
 msgid "l"
 msgstr "l"
 
-#: g10/card-util.c:1169 g10/keyedit.c:1263
+#: g10/card-util.c:1257 g10/keyedit.c:1263
 msgid "debug"
 msgstr "debug"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 #, fuzzy
 msgid "name"
 msgstr "enable"
 
-#: g10/card-util.c:1170
+#: g10/card-util.c:1258
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "url"
 msgstr ""
 
-#: g10/card-util.c:1171
+#: g10/card-util.c:1259
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1172
+#: g10/card-util.c:1260
 msgid "fetch"
 msgstr ""
 
-#: g10/card-util.c:1173
+#: g10/card-util.c:1261
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "login"
 msgstr "lsign"
 
-#: g10/card-util.c:1174
+#: g10/card-util.c:1262
 #, fuzzy
 msgid "change the login name"
 msgstr "���ϥδ���"
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 msgid "lang"
 msgstr ""
 
-#: g10/card-util.c:1175
+#: g10/card-util.c:1263
 #, fuzzy
 msgid "change the language preferences"
 msgstr "���D�[�H��"
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "sex"
 msgstr ""
 
-#: g10/card-util.c:1176
+#: g10/card-util.c:1264
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "cafpr"
 msgstr "fpr"
 
-#: g10/card-util.c:1177
+#: g10/card-util.c:1265
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "��ܫ���"
 
-#: g10/card-util.c:1178
+#: g10/card-util.c:1266
 #, fuzzy
 msgid "forcesig"
 msgstr "revsig"
 
-#: g10/card-util.c:1179
+#: g10/card-util.c:1267
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1180
+#: g10/card-util.c:1268
 #, fuzzy
 msgid "generate"
 msgstr "�@��ʿ��~"
 
-#: g10/card-util.c:1181
+#: g10/card-util.c:1269
 #, fuzzy
 msgid "generate new keys"
 msgstr "���ͤ@���s�����_��"
 
-#: g10/card-util.c:1182 g10/keyedit.c:1287
+#: g10/card-util.c:1270 g10/keyedit.c:1287
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/card-util.c:1182
+#: g10/card-util.c:1270
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1246 g10/keyedit.c:1397
+#: g10/card-util.c:1272
+msgid "privatedo"
+msgstr ""
+
+#: g10/card-util.c:1336 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "���O> "
 
-#: g10/card-util.c:1281
+#: g10/card-util.c:1371
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "���O�����٬�\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1387
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "���O�����٬�\n"
 
-#: g10/card-util.c:1299
+#: g10/card-util.c:1389
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/card-util.c:1360 g10/keyedit.c:1864
+#: g10/card-util.c:1458 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
 
-#: g10/cardglue.c:280
+#: g10/cardglue.c:287
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:364
+#: g10/cardglue.c:371
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:372
+#: g10/cardglue.c:379
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:687
+msgid "Enter New Admin PIN: "
+msgstr ""
+
+#: g10/cardglue.c:688
+msgid "Enter New PIN: "
+msgstr ""
+
+#: g10/cardglue.c:689
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:638
+#: g10/cardglue.c:690
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "�ЦA��J�@���K�X��G "
+
+#: g10/cardglue.c:718
+#, fuzzy
+msgid "PIN not correctly repeated; try again"
+msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
+
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3577 g10/keyring.c:376
 #: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
@@ -690,13 +777,13 @@ msgstr "�L�k�}�� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output �b�o�өR�O���S���@��\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/delkey.c:74 g10/export.c:168 g10/keyedit.c:2918 g10/keyserver.c:1414
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�䤣�� `%s' ���_�G %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/delkey.c:82 g10/export.c:198 g10/keyserver.c:1428 g10/revoke.c:232
 #: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -739,7 +826,7 @@ msgstr "���_ \"%s\" ���۹������p�_�I\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�Х��H \"--delete-secret-keys\" �ﶵ�ӧR�����C\n"
 
-#: g10/encode.c:210 g10/sign.c:1184
+#: g10/encode.c:210 g10/sign.c:1186
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
@@ -758,7 +845,7 @@ msgstr "ñ�p�ɥ��ѤF�G %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' �w�g�Q���Y�F\n"
 
-#: g10/encode.c:308 g10/encode.c:604 g10/sign.c:550
+#: 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"
@@ -783,7 +870,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
 
-#: g10/encode.c:648 g10/sign.c:876
+#: g10/encode.c:648 g10/sign.c:877
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -881,27 +968,27 @@ msgstr "ĵ�i�G�L�k�����Ȧs�� (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ĵ�i�G�L�k�����Ȧs�ؿ� `%s': %s\n"
 
-#: g10/export.c:176
+#: g10/export.c:182
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/export.c:206
+#: g10/export.c:211
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "���_ %08lX: ���Q�O�@ �w �w���L\n"
 
-#: g10/export.c:214
+#: g10/export.c:219
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "���_ %08lX: PGP 2.x �˦������_ �w �w���L\n"
 
-#: g10/export.c:361
+#: g10/export.c:384
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�Чi�G�p�_ %08lX �èS���������@ SK �[�`�ˬd\n"
 
-#: g10/export.c:393
+#: g10/export.c:416
 msgid "WARNING: nothing exported\n"
 msgstr "ĵ�i�G�S���ץX����F��\n"
 
@@ -1080,15 +1167,15 @@ msgstr "���n���������"
 msgid "prompt before overwriting"
 msgstr "�мg�e���߰�"
 
-#: g10/g10.c:511
+#: g10/g10.c:507
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:512
+#: g10/g10.c:508
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/g10.c:537
+#: g10/g10.c:533
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1096,7 +1183,7 @@ msgstr ""
 "@\n"
 "(�аѷӽu�W���������Ө��o�Ҧ��R�O�M�ﶵ������M��)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1116,15 +1203,15 @@ msgstr ""
 " --list-keys [�W�r]         ��ܪ��_\n"
 " --fingerprint [�W�r]       ��ܫ���\n"
 
-#: g10/g10.c:726 g10/gpgv.c:92
+#: g10/g10.c:716 g10/gpgv.c:92
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�ЦV <[email protected]> �^���{���岫�C\n"
 
-#: g10/g10.c:743
+#: g10/g10.c:733
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ϊk�G gpg [�ﶵ] [�ɮ�] (�Υ� -h �D�U)"
 
-#: g10/g10.c:746
+#: g10/g10.c:736
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1134,7 +1221,7 @@ msgstr ""
 "ñ�p�B�ˬd�B�[�K�θѱK\n"
 "�w�]���ާ@�|�̿�J��Ʀөw\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1142,483 +1229,483 @@ msgstr ""
 "\n"
 "�w�Q�䴩���t��k�G\n"
 
-#: g10/g10.c:760
+#: g10/g10.c:750
 msgid "Pubkey: "
 msgstr "���_�G "
 
-#: g10/g10.c:766 g10/keyedit.c:1901
+#: g10/g10.c:756 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�s�K�k�G "
 
-#: g10/g10.c:772
+#: g10/g10.c:762
 msgid "Hash: "
 msgstr "����G "
 
-#: g10/g10.c:778 g10/keyedit.c:1947
+#: g10/g10.c:768 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "���Y�G "
 
-#: g10/g10.c:861
+#: g10/g10.c:851
 msgid "usage: gpg [options] "
 msgstr "�Ϊk�G gpg [�ﶵ] "
 
-#: g10/g10.c:964
+#: g10/g10.c:999
 msgid "conflicting commands\n"
 msgstr "���O�����٬�\n"
 
-#: g10/g10.c:982
+#: g10/g10.c:1017
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "�b�u%s�v�s�թw�q�̧䤣�� = �O��\n"
 
-#: g10/g10.c:1179
+#: g10/g10.c:1214
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1182
+#: g10/g10.c:1217
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1185
+#: g10/g10.c:1220
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1191
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
 
-#: g10/g10.c:1194
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
 
-#: g10/g10.c:1197
+#: g10/g10.c:1232
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���\�i�ä��w��\n"
 
-#: g10/g10.c:1203
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1206
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1209
+#: g10/g10.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��Ҧ��v�ä��w��\n"
 
-#: g10/g10.c:1215
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 
-#: g10/g10.c:1218
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 
-#: g10/g10.c:1221
+#: g10/g10.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ĵ�i�G %s \"%s\" ���ʤJ�ؿ��\�i�ä��w��\n"
 
-#: g10/g10.c:1362
+#: g10/g10.c:1397
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�s���]�w�� `%s' �Q�إߤF\n"
 
-#: g10/g10.c:1762
+#: g10/g10.c:1797
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "�Ъ`�N�G�¦����w�]�ﶵ�� `%s' �w�Q����\n"
 
-#: g10/g10.c:1804
+#: g10/g10.c:1839
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "�Ъ`�N�G�S���w�]�ﶵ�� `%s'\n"
 
-#: g10/g10.c:1808
+#: g10/g10.c:1843
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "�ﶵ�� `%s' �G %s\n"
 
-#: g10/g10.c:1815
+#: g10/g10.c:1850
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�q `%s' Ū���ﶵ\n"
 
-#: g10/g10.c:2035 g10/g10.c:2551 g10/g10.c:2562
+#: g10/g10.c:2066 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"
 
-#: g10/g10.c:2048
+#: g10/g10.c:2079
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
 
-#: g10/g10.c:2260
+#: g10/g10.c:2293
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ���O�@�Ӧ��Ī��r����\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3437
+#: g10/g10.c:2312 g10/keyedit.c:3434
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�L�k���R���_���A�� URI\n"
 
-#: g10/g10.c:2285
+#: g10/g10.c:2318
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2288
+#: g10/g10.c:2321
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2295
+#: g10/g10.c:2328
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2298
+#: g10/g10.c:2331
 msgid "invalid import options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2305
+#: g10/g10.c:2338
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2308
+#: g10/g10.c:2341
 msgid "invalid export options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2315
+#: g10/g10.c:2348
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2318
+#: g10/g10.c:2351
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�L�Ī��פJ�ﶵ\n"
 
-#: g10/g10.c:2340
+#: g10/g10.c:2373
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2343
+#: g10/g10.c:2376
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�L�Ī��ץX�ﶵ\n"
 
-#: g10/g10.c:2350
+#: g10/g10.c:2383
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�L�k������ɸ��|�]�� %s\n"
 
-#: g10/g10.c:2540
+#: g10/g10.c:2573
 msgid "WARNING: program may create a core file!\n"
 msgstr "ĵ�i�G�{���i��|�ɦL�X�֤��ɡI\n"
 
-#: g10/g10.c:2544
+#: g10/g10.c:2577
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ĵ�i�G %s �|�ϱo %s ����\n"
 
-#: g10/g10.c:2553
+#: g10/g10.c:2586
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ���Q���\�� %s �֥�\n"
 
-#: g10/g10.c:2556
+#: g10/g10.c:2589
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:2577
+#: g10/g10.c:2610
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "�p�馳�b --pgp2 �Ҧ��U�ׯవ�X�������Ω���ñ��\n"
 
-#: g10/g10.c:2583
+#: g10/g10.c:2616
 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"
 
-#: g10/g10.c:2589
+#: g10/g10.c:2622
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "�ҥ� --pgp2 �ɩp�����Өϥ��ɮסA�ӫD�޹D\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2635
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�b --pgp2 �Ҧ��U�[�K�T���ݭn IDEA �s�K�k\n"
 
-#: g10/g10.c:2672 g10/g10.c:2696
+#: g10/g10.c:2705 g10/g10.c:2729
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:2678 g10/g10.c:2702
+#: g10/g10.c:2711 g10/g10.c:2735
 msgid "selected digest algorithm is invalid\n"
 msgstr "�ҿ諸�K�n�t��k�L��\n"
 
-#: g10/g10.c:2684
+#: g10/g10.c:2717
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "�ҿ諸�s�K�t��k�L��\n"
 
-#: g10/g10.c:2690
+#: g10/g10.c:2723
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�ҿ諸���ҺK�n�t��k�L��\n"
 
-#: g10/g10.c:2705
+#: g10/g10.c:2738
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed �@�w�n�j�� 0\n"
 
-#: g10/g10.c:2707
+#: g10/g10.c:2740
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed �@�w�n�j�� 1\n"
 
-#: g10/g10.c:2709
+#: g10/g10.c:2742
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth �@�w�n���� 1 �M 255 ����\n"
 
-#: g10/g10.c:2711
+#: g10/g10.c:2744
 #, fuzzy
 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"
 
-#: g10/g10.c:2713
+#: g10/g10.c:2746
 #, fuzzy
 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"
 
-#: g10/g10.c:2716
+#: g10/g10.c:2749
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "�Ъ`�N�G�j�P����ij�ϥγ�ª� S2K �Ҧ� (0)\n"
 
-#: g10/g10.c:2720
+#: g10/g10.c:2753
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�L�Ī� S2K �Ҧ��F�@�w�n�O 0 �B 1 �� 3\n"
 
-#: g10/g10.c:2727
+#: g10/g10.c:2760
 msgid "invalid default preferences\n"
 msgstr "�L�Ī��w�]���n\n"
 
-#: g10/g10.c:2736
+#: g10/g10.c:2769
 msgid "invalid personal cipher preferences\n"
 msgstr "�L�Ī��ӤH�s�K�k���n\n"
 
-#: g10/g10.c:2740
+#: g10/g10.c:2773
 msgid "invalid personal digest preferences\n"
 msgstr "�L�Ī��ӤH�K�n���n\n"
 
-#: g10/g10.c:2744
+#: g10/g10.c:2777
 msgid "invalid personal compress preferences\n"
 msgstr "�L�Ī��ӤH���Y���n\n"
 
-#: g10/g10.c:2777
+#: g10/g10.c:2810
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �� %s ��b�@�_�S���N�q�I\n"
 
-#: g10/g10.c:2824
+#: g10/g10.c:2857
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2829
+#: g10/g10.c:2862
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2834
+#: g10/g10.c:2867
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:2930
+#: g10/g10.c:2963
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�H����Ʈw�ҩl���ѡG %s\n"
 
-#: g10/g10.c:2941
+#: g10/g10.c:2974
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ĵ�i�G���w������� (-r) ���ϥΤ��_�[�K\n"
 
-#: g10/g10.c:2952
+#: g10/g10.c:2985
 msgid "--store [filename]"
 msgstr "--store [�ɦW]"
 
-#: g10/g10.c:2959
+#: g10/g10.c:2992
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ɦW]"
 
-#: g10/g10.c:2961
+#: g10/g10.c:2994
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "�ѱK���ѡG %s\n"
 
-#: g10/g10.c:2971
+#: g10/g10.c:3004
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ɦW]"
 
-#: g10/g10.c:2984
+#: g10/g10.c:3017
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:2986
+#: g10/g10.c:3019
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:2989
+#: g10/g10.c:3022
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:3007
+#: g10/g10.c:3040
 msgid "--sign [filename]"
 msgstr "--sign [�ɦW]"
 
-#: g10/g10.c:3020
+#: g10/g10.c:3053
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3068
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ɦW]"
 
-#: g10/g10.c:3037
+#: g10/g10.c:3070
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3040
+#: g10/g10.c:3073
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "�p���ӱN %s �Ω� %s �Ҧ���\n"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3093
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ɦW]"
 
-#: g10/g10.c:3069
+#: g10/g10.c:3102
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ɦW]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3127
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ɦW]"
 
-#: g10/g10.c:3102
+#: g10/g10.c:3135
 msgid "--sign-key user-id"
 msgstr "--sign-key �ϥΪ�ID"
 
-#: g10/g10.c:3106
+#: g10/g10.c:3139
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �ϥΪ�ID"
 
-#: g10/g10.c:3110
+#: g10/g10.c:3143
 msgid "--nrsign-key user-id"
 msgstr "--nrsign-key �ϥΪ�ID"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3147
 msgid "--nrlsign-key user-id"
 msgstr "--nrlsign-key �ϥΪ�ID"
 
-#: g10/g10.c:3138
+#: g10/g10.c:3171
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �ϥΪ�ID [���O]"
 
-#: g10/g10.c:3209
+#: g10/g10.c:3242
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�ϥΪ�ID] [�_�Ͱ�]"
 
-#: g10/g10.c:3246
+#: g10/g10.c:3279
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3248
+#: g10/g10.c:3281
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3250
+#: g10/g10.c:3283
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3261
+#: g10/g10.c:3294
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/g10.c:3271
+#: g10/g10.c:3304
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/g10.c:3312
+#: g10/g10.c:3345
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "�Ѷ}�ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:3320
+#: g10/g10.c:3353
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�i��ʸ˥��ѡG %s\n"
 
-#: g10/g10.c:3407
+#: g10/g10.c:3440
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�L�Ī� `%s' ����t��k\n"
 
-#: g10/g10.c:3530
+#: g10/g10.c:3563
 msgid "[filename]"
 msgstr "[�ɦW]"
 
-#: g10/g10.c:3534
+#: g10/g10.c:3567
 msgid "Go ahead and type your message ...\n"
 msgstr "�ж}�l��J�p���T�� ...\n"
 
-#: g10/g10.c:3824
+#: g10/g10.c:3857
 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"
 
-#: g10/g10.c:3832
+#: g10/g10.c:3865
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�ϥΪ̼аO�W�٤@�w�n�t���u@�v�r��\n"
 
-#: g10/g10.c:3842
+#: g10/g10.c:3875
 msgid "a notation value must not use any control characters\n"
 msgstr "�аO�Ȥ@�w����ϥΥ��󪺱���r��\n"
 
-#: g10/g10.c:3876
+#: g10/g10.c:3909
 msgid "the given certification policy URL is invalid\n"
 msgstr "���w�������ҭ�h URL �L��\n"
 
-#: g10/g10.c:3878
+#: g10/g10.c:3911
 msgid "the given signature policy URL is invalid\n"
 msgstr "���w����h URL �L��\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3944
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���w����h URL �L��\n"
@@ -1627,27 +1714,27 @@ msgstr "���w����h URL �L��\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk �֨��̦��Ӧh���� �w �w�T��\n"
 
-#: g10/getkey.c:186 g10/getkey.c:2691
+#: g10/getkey.c:186 g10/getkey.c:2711
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[�䤣��ϥΪ� ID]"
 
-#: g10/getkey.c:1614
+#: g10/getkey.c:1639
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid �����L�Ī����_ %08lX �ͮ�\n"
 
-#: g10/getkey.c:2169
+#: g10/getkey.c:2189
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "���_ %08lX �S���۹������p�_ �w ���b����\n"
 
-#: g10/getkey.c:2400
+#: g10/getkey.c:2420
 #, fuzzy, c-format
 msgid "using secondary key %s instead of primary key %s\n"
 msgstr "���b�ϥΦ��_ %08lX �Ӵ����D�_ %08lX\n"
 
-#: g10/getkey.c:2447
+#: g10/getkey.c:2467
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "���_ %08lX: �馳�p�_�ӨS�����_ �w �w���L\n"
@@ -1990,374 +2077,374 @@ msgstr "�S���i������"
 msgid "No help available for `%s'"
 msgstr "`%s' �S���i������"
 
-#: g10/import.c:247
+#: g10/import.c:249
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "���b���L %d ���A���϶�\n"
 
-#: g10/import.c:256
+#: g10/import.c:258
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "�w�� %lu ����_�Q�B�z�F\n"
 
-#: g10/import.c:273
+#: g10/import.c:275
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "�`�@�Q�B�z���ƶq�G %lu\n"
 
-#: g10/import.c:275
+#: g10/import.c:277
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �w���L���s���_�G %lu\n"
 
-#: g10/import.c:278
+#: g10/import.c:280
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "      �S���ϥΪ̪� ID�G %lu\n"
 
-#: g10/import.c:280
+#: g10/import.c:282
 #, c-format
 msgid "              imported: %lu"
 msgstr "               �w�פJ�G %lu"
 
-#: g10/import.c:286
+#: g10/import.c:288
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             �����ܪ��G %lu\n"
 
-#: g10/import.c:288
+#: g10/import.c:290
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        �s���ϥΪ� ID�G %lu\n"
 
-#: g10/import.c:290
+#: g10/import.c:292
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             �s���l�_�G %lu\n"
 
-#: g10/import.c:292
+#: g10/import.c:294
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             �s���G %lu\n"
 
-#: g10/import.c:294
+#: g10/import.c:296
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         �s�����_�M�P�G %lu\n"
 
-#: g10/import.c:296
+#: g10/import.c:298
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "         �QŪ�����p�_�G %lu\n"
 
-#: g10/import.c:298
+#: g10/import.c:300
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "         �w�פJ���p�_�G %lu\n"
 
-#: g10/import.c:300
+#: g10/import.c:302
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "         �����ܪ��p�_�G %lu\n"
 
-#: g10/import.c:302
+#: g10/import.c:304
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             ���Q�פJ�G %lu\n"
 
-#: g10/import.c:543
+#: g10/import.c:545
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:545
+#: g10/import.c:547
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
 
-#: g10/import.c:582
+#: g10/import.c:584
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:594
+#: g10/import.c:596
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s �A�K�n�t��k %s\n"
 
-#: g10/import.c:606
+#: g10/import.c:608
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:619
+#: g10/import.c:621
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:621
+#: g10/import.c:623
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:645
+#: g10/import.c:647
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:693 g10/import.c:1047
+#: g10/import.c:695 g10/import.c:1049
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "���_ %08lX: �S���ϥΪ� ID\n"
 
-#: g10/import.c:713
+#: g10/import.c:715
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "���_ %08lX: HKP �l�_���_�~�w�Q�״_\n"
 
-#: g10/import.c:728
+#: g10/import.c:730
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "���_ %08lX: �D�ۧ�ñ�p���ϥΪ� ID `%s' �w�Q����\n"
 
-#: g10/import.c:734
+#: g10/import.c:736
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "���_ %08lX: �S�����Ī��ϥΪ� ID\n"
 
-#: g10/import.c:736
+#: g10/import.c:738
 msgid "this may be caused by a missing self-signature\n"
 msgstr "�o�i��O�ѩ�򥢦ۧ�ñ���ҾɭP����G\n"
 
-#: g10/import.c:746 g10/import.c:1168
+#: g10/import.c:748 g10/import.c:1170
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "���_ %08lX: �䤣�줽�_�G %s\n"
 
-#: g10/import.c:752
+#: g10/import.c:754
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "���_ %08lX: �s���_ �w �w���L\n"
 
-#: g10/import.c:761
+#: g10/import.c:763
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "�䤣��i�g���_�Ͱ�G %s\n"
 
-#: g10/import.c:766 g10/openfile.c:261
+#: g10/import.c:768 g10/openfile.c:261 g10/sign.c:784 g10/sign.c:1042
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "���b�g�� `%s'\n"
 
-#: g10/import.c:772 g10/import.c:862 g10/import.c:1087 g10/import.c:1229
+#: g10/import.c:774 g10/import.c:864 g10/import.c:1089 g10/import.c:1231
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�g���_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/import.c:791
+#: g10/import.c:793
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "���_ %08lX: ���_ \"%s\" �w�Q�פJ\n"
 
-#: g10/import.c:815
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "���_ %08lX: ��ڭ̪��ƥ����k�X\n"
 
-#: g10/import.c:832 g10/import.c:1186
+#: g10/import.c:834 g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "���_ %08lX: �L�k�w���l�����_�϶��G %s\n"
 
-#: g10/import.c:840 g10/import.c:1193
+#: g10/import.c:842 g10/import.c:1195
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "���_ %08lX: �L�kŪ����l�����_�϶��G %s\n"
 
-#: g10/import.c:872
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "���_ %08lX: \"%s\" 1 �ӷs���ϥΪ� ID\n"
 
-#: g10/import.c:875
+#: g10/import.c:877
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "���_ %08lX: \"%s\" %d �ӷs���ϥΪ� ID\n"
 
-#: g10/import.c:878
+#: g10/import.c:880
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "���_ %08lX: \"%s\" 1 �ӷs��ñ��\n"
 
-#: g10/import.c:881
+#: g10/import.c:883
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "���_ %08lX: \"%s\" %d �ӷs��ñ��\n"
 
-#: g10/import.c:884
+#: g10/import.c:886
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "���_ %08lX: \"%s\" 1 �ӷs���l�_\n"
 
-#: g10/import.c:887
+#: g10/import.c:889
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "���_ %08lX: \"%s\" %d �ӷs���l�_\n"
 
-#: g10/import.c:908
+#: g10/import.c:910
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "���_ %08lX: \"%s\" �S���Q����\n"
 
-#: g10/import.c:1053
+#: g10/import.c:1055
 #, fuzzy, 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"
 
-#: g10/import.c:1064
+#: g10/import.c:1066
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/import.c:1081
+#: g10/import.c:1083
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�S���w�]���p�_�_�Ͱ�G %s\n"
 
-#: g10/import.c:1092
+#: g10/import.c:1094
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "���_ %08lX: �p�_�Q�פJ�F\n"
 
-#: g10/import.c:1121
+#: g10/import.c:1123
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "���_ %08lX: �w�g�b�p�_�_�Ͱ餤�F\n"
 
-#: g10/import.c:1131
+#: g10/import.c:1133
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "���_ %08lX: �䤣��p�_�G %s\n"
 
-#: g10/import.c:1161
+#: g10/import.c:1163
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "���_ %08lX: �S�����_ �w �L�k�M�κM�P����\n"
 
-#: g10/import.c:1204
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w��^\n"
 
-#: g10/import.c:1236
+#: g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "���_ %08lX: \"%s\" �M�P���Ҥw�Q�פJ\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1303
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "���_ %08lX: ñ���S���ϥΪ� ID\n"
 
-#: g10/import.c:1316
+#: g10/import.c:1318
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "���_ %08lX: �ϥΪ� ID \"%s\" �ϥΤF���Q�䴩�����}���_�t��k\n"
 
-#: g10/import.c:1318
+#: g10/import.c:1320
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "���_ %08lX: �ϥΪ� ID \"%s\" ���L�Ī��ۧ�ñ��\n"
 
-#: g10/import.c:1336
+#: g10/import.c:1338
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "���_ %08lX: �S���l�_�i�Ѫ��a\n"
 
-#: g10/import.c:1347 g10/import.c:1397
+#: g10/import.c:1349 g10/import.c:1399
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "���_ %08lX: ���Q�䴩�����}���_�t��k\n"
 
-#: g10/import.c:1349
+#: g10/import.c:1351
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "���_ %08lX: �L�Ī����a�l�_\n"
 
-#: g10/import.c:1364
+#: g10/import.c:1366
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "���_ %08lX: �h�����a�l�_�w�Q����\n"
 
-#: g10/import.c:1386
+#: g10/import.c:1388
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "���_ %08lX: �S���l�_�i�Ѫ��_�M�P\n"
 
-#: g10/import.c:1399
+#: g10/import.c:1401
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "���_ %08lX: �L�Ī��l�_�M�P\n"
 
-#: g10/import.c:1414
+#: g10/import.c:1416
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "���_ %08lX: �h���l�_�M�P�w����\n"
 
-#: g10/import.c:1456
+#: g10/import.c:1458
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "���_ %08lX: �w���L�ϥΪ� ID '"
 
-#: g10/import.c:1477
+#: g10/import.c:1479
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "���_ %08lX: �l�_�w���L\n"
 
-#: g10/import.c:1504
+#: g10/import.c:1506
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "���_ %08lX: ���i�ץX��ñ�� (���� %02x) �w �w���L\n"
 
-#: g10/import.c:1514
+#: g10/import.c:1516
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "���_ %08lX: �M�P���Ҧb���~���a�� �w �w���L\n"
 
-#: g10/import.c:1531
+#: g10/import.c:1533
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "���_ %08lX: �L�Ī��M�P���ҡG %s �w �w���L\n"
 
-#: g10/import.c:1545
+#: g10/import.c:1547
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "���_ %08lX: �l�_�b���~���a�� �w �w���L\n"
 
-#: g10/import.c:1553
+#: g10/import.c:1555
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "���_ %08lX: �D�w�������� (0x%02X) �w �w���L\n"
 
-#: g10/import.c:1653
+#: g10/import.c:1655
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "���_ %08lX: �����쭫�ƪ��ϥΪ� ID �w �w�X��\n"
 
-#: g10/import.c:1715
+#: g10/import.c:1717
 #, fuzzy, 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"
 
-#: g10/import.c:1729
+#: g10/import.c:1731
 #, fuzzy, 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"
 
-#: g10/import.c:1788
+#: g10/import.c:1790
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "���_ %08lX: �w�s�W�M�P���� \"%s\"\n"
 
-#: g10/import.c:1822
+#: g10/import.c:1824
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "���_ %08lX: �w�s�W�������_ñ��\n"
@@ -2590,7 +2677,7 @@ msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) �ګD�`�p�ߦa�ˬd�L�F�C %s\n"
 
 #: g10/keyedit.c:894
-msgid "Your selection? (enter '?' for more information): "
+msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
 #: g10/keyedit.c:918
@@ -2663,7 +2750,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u���nñ�p�ܡH "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
+#: g10/keyedit.c:1028 g10/keyedit.c:3882 g10/keyedit.c:3973 g10/keyedit.c:4046
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2694,7 +2781,7 @@ msgstr ""
 "��J�n���o��p�_���s�K�X��C\n"
 "\n"
 
-#: g10/keyedit.c:1127 g10/keygen.c:1806
+#: g10/keyedit.c:1127 g10/keygen.c:1818
 msgid "passphrase not correctly repeated; try again"
 msgstr "�K�X��A����J�ɨS�����T���ơF�ЦA�դ@��"
 
@@ -3173,83 +3260,67 @@ msgstr ""
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2243
-#, c-format
-msgid "This key may be revoked by %s key "
+#: g10/keyedit.c:2245
+#, fuzzy, c-format
+msgid "This key may be revoked by %s key %s"
 msgstr "�o����_�i��Q %s ���_�M�P�F "
 
-#: g10/keyedit.c:2247
-msgid " (sensitive)"
+#: g10/keyedit.c:2251
+#, fuzzy
+msgid "(sensitive)"
 msgstr " �]���K���^"
 
-#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
+#: g10/keyedit.c:2267 g10/keyedit.c:2323 g10/keyedit.c:2435 g10/keyedit.c:2450
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�L�k�إ� %s: %s\n"
 
-#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
+#: g10/keyedit.c:2270 g10/keylist.c:723 g10/keylist.c:817 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[�w�M�P]"
 
-#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
+#: g10/keyedit.c:2272 g10/keylist.c:694 g10/keylist.c:823
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
-#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
+#: g10/keyedit.c:2274 g10/keyedit.c:2325 g10/keyedit.c:2437 g10/keyedit.c:2452
+#: 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
 msgid "expires: %s"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keyedit.c:2270
+#: g10/keyedit.c:2276
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �H���G %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2291
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �H���G %c/%c"
 
-#: g10/keyedit.c:2289
+#: g10/keyedit.c:2295
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2296
+#: g10/keyedit.c:2302
 msgid "This key has been disabled"
 msgstr "�o����_�w�g�Q�T�ΤF"
 
-#: g10/keyedit.c:2324
+#: g10/keyedit.c:2330
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
-
-#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
-#: g10/mainproc.c:1575 g10/trustdb.c:1133
-#, fuzzy
-msgid "revoked"
-msgstr "[�w�M�P]"
-
-#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
-#: g10/mainproc.c:1577 g10/trustdb.c:500
-#, fuzzy
-msgid "expired"
-msgstr "expire"
-
-#: g10/keyedit.c:2400
+#: g10/keyedit.c:2397
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
 
-#: g10/keyedit.c:2408
+#: g10/keyedit.c:2405
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3257,13 +3328,25 @@ msgstr ""
 "�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
 "���D�p���s����{���C\n"
 
-#: g10/keyedit.c:2539
+#: g10/keyedit.c:2469 g10/keyserver.c:376 g10/mainproc.c:1575
+#: g10/trustdb.c:1162
+#, fuzzy
+msgid "revoked"
+msgstr "[�w�M�P]"
+
+#: g10/keyedit.c:2471 g10/keyserver.c:380 g10/mainproc.c:1577
+#: g10/trustdb.c:529
+#, fuzzy
+msgid "expired"
+msgstr "expire"
+
+#: g10/keyedit.c:2536
 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:2599
+#: g10/keyedit.c:2596
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3272,45 +3355,45 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2604 g10/keyedit.c:2882
+#: g10/keyedit.c:2601 g10/keyedit.c:2879
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�p�T�w���M�Q�n�W�[�ܡH (y/N) "
 
-#: g10/keyedit.c:2610
+#: g10/keyedit.c:2607
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
 
-#: g10/keyedit.c:2750
+#: g10/keyedit.c:2747
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2757
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2764
+#: g10/keyedit.c:2761
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2770
+#: g10/keyedit.c:2767
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2781
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2785
+#: g10/keyedit.c:2782
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2788
+#: g10/keyedit.c:2785
 msgid "Nothing deleted.\n"
 msgstr "�S���F��Q�R���C\n"
 
-#: g10/keyedit.c:2877
+#: g10/keyedit.c:2874
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3319,159 +3402,159 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2888
+#: g10/keyedit.c:2885
 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"
 
-#: g10/keyedit.c:2908
+#: g10/keyedit.c:2905
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2928
 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"
 
-#: g10/keyedit.c:2946
+#: g10/keyedit.c:2943
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
 
-#: g10/keyedit.c:2968
+#: g10/keyedit.c:2965
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
 
-#: g10/keyedit.c:2987
+#: g10/keyedit.c:2984
 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"
 
-#: g10/keyedit.c:2993
+#: g10/keyedit.c:2990
 #, fuzzy
 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): "
 
-#: g10/keyedit.c:3054
+#: g10/keyedit.c:3051
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�бq�p�_��������ܡC\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3057
 msgid "Please select at most one secondary key.\n"
 msgstr "�Цܦh��ܤ@�⦸�_�C\n"
 
-#: g10/keyedit.c:3064
+#: g10/keyedit.c:3061
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
 
-#: g10/keyedit.c:3067
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for the primary key.\n"
 msgstr "���b�ܧ�D�_���ϥδ����C\n"
 
-#: g10/keyedit.c:3113
+#: g10/keyedit.c:3110
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
 
-#: g10/keyedit.c:3129
+#: g10/keyedit.c:3126
 msgid "No corresponding signature in secret ring\n"
 msgstr "�b�p�_��̨S���@�P��ñ��\n"
 
-#: g10/keyedit.c:3209
+#: g10/keyedit.c:3206
 msgid "Please select exactly one user ID.\n"
 msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
+#: g10/keyedit.c:3245 g10/keyedit.c:3355 g10/keyedit.c:3474
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
 
-#: g10/keyedit.c:3419
+#: g10/keyedit.c:3416
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3498
+#: g10/keyedit.c:3495
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�p�T�w�n�Υ��ܡH (y/N) "
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3496
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�p�T�w�n�Υ��ܡH (y/N) "
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3558
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "���� %d �S���ϥΪ� ID\n"
 
-#: g10/keyedit.c:3607
+#: g10/keyedit.c:3604
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "���� %d �S�����_\n"
 
-#: g10/keyedit.c:3724
+#: g10/keyedit.c:3721
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�ϥΪ� ID�G \""
 
-#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
+#: g10/keyedit.c:3724 g10/keyedit.c:3788 g10/keyedit.c:3831
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   �� %08lX ñ�p�� %s%s%s\n"
 
-#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
+#: g10/keyedit.c:3726 g10/keyedit.c:3790 g10/keyedit.c:3833
 msgid " (non-exportable)"
 msgstr " (���i�ץX)"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3730
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3734
 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) "
 
-#: g10/keyedit.c:3741
+#: g10/keyedit.c:3738
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
 
-#: g10/keyedit.c:3768
+#: g10/keyedit.c:3765
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
 
-#: g10/keyedit.c:3794
+#: g10/keyedit.c:3791
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (���i�ץX)"
 
-#: g10/keyedit.c:3801
+#: g10/keyedit.c:3798
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   �� %08lX �M�P�� %s\n"
 
-#: g10/keyedit.c:3823
+#: g10/keyedit.c:3820
 msgid "You are about to revoke these signatures:\n"
 msgstr "�p���b�M�P�o���G\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3840
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3870
 msgid "no secret key\n"
 msgstr "�S���p�_\n"
 
-#: g10/keyedit.c:3943
+#: g10/keyedit.c:3940
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3957
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
 
-#: g10/keyedit.c:4129
+#: g10/keyedit.c:4126
 #, fuzzy, 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"
@@ -3513,12 +3596,12 @@ msgstr "���b�g�J�ۧ�ñ��\n"
 msgid "writing key binding signature\n"
 msgstr "���b�g�J���_ñ��\n"
 
-#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2613
+#: g10/keygen.c:974 g10/keygen.c:1058 g10/keygen.c:1149 g10/keygen.c:2625
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "���_�ؤo�L�ġF��� %u �줸\n"
 
-#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2619
+#: g10/keygen.c:979 g10/keygen.c:1063 g10/keygen.c:1154 g10/keygen.c:2631
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "���_�ؤo�W�j�� %u �줸\n"
@@ -3586,88 +3669,60 @@ msgstr "   (%d) DSA (�ȯ�ñ�p��)\n"
 
 #: g10/keygen.c:1353
 #, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (�ȯ�[�K��)\n"
+
+#: g10/keygen.c:1355
+#, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal (�ȯ�[�K��)\n"
 
-#: g10/keygen.c:1354
+#: g10/keygen.c:1356
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (�ȯ�ñ�p��)\n"
 
-#: g10/keygen.c:1356
+#: g10/keygen.c:1358
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�ȯ�[�K��)\n"
 
-#: g10/keygen.c:1358
+#: g10/keygen.c:1360
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȯ�[�K��)\n"
 
-#: g10/keygen.c:1409
-#, c-format
-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"
-
-#: g10/keygen.c:1418
-msgid "What keysize do you want? (1024) "
-msgstr "�p�Q�n�Φh�j�����_�ؤo�H (1024) "
-
-#: g10/keygen.c:1423
-msgid "DSA only allows keysizes from 512 to 1024\n"
-msgstr "DSA �����_�ؤo��श�� 512 �M 1024 ����\n"
-
-#: g10/keygen.c:1425
-msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
-msgstr "���_�ؤo�Ӥp�F RSA �����_�ؤo�̰_�X�����n�� 1024 �C\n"
-
-#: g10/keygen.c:1428
-msgid "keysize too small; 768 is smallest value allowed.\n"
-msgstr "���_�ؤo�Ӥp�F�̰_�X�����n�� 768 �C\n"
+#: g10/keygen.c:1429 g10/keygen.c:2502
+#, fuzzy, c-format
+msgid "DSA keypair will have %u bits.\n"
+msgstr "DSA ���_��|�� 1024 �줸�C\n"
 
 #: g10/keygen.c:1439
 #, c-format
-msgid "keysize too large; %d is largest value allowed.\n"
-msgstr "���_�ؤo�Ӥj�F�̤j�����Ψ� %d �C\n"
-
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY long!\n"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"����ij�ϥΤj�� 2048 �����_�ؤo�A\n"
-"�]���p�� *�u��* �|��h�ܦh�ɶ��I\n"
 
-#: g10/keygen.c:1447
-#, fuzzy
-msgid "Are you sure that you want this keysize? (y/N) "
-msgstr "�p�T�w�n�γo�Ӫ��_�ؤo�ܡH "
+#: g10/keygen.c:1446
+#, fuzzy, c-format
+msgid "What keysize do you want? (%u) "
+msgstr "�p�Q�n�Φh�j�����_�ؤo�H (1024) "
 
-#: g10/keygen.c:1449
-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"
+#: g10/keygen.c:1460
+#, c-format
+msgid "%s keysizes must be in the range %u-%u\n"
+msgstr ""
 
-#: g10/keygen.c:1458
+#: g10/keygen.c:1466
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�p�ҭn�D�����_�ؤo�O %u �줸\n"
 
-#: g10/keygen.c:1461 g10/keygen.c:1465
+#: g10/keygen.c:1471 g10/keygen.c:1476
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�[�j�� %u �줸\n"
 
-#: g10/keygen.c:1516
+#: g10/keygen.c:1528
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -3683,7 +3738,7 @@ msgstr ""
 "      <n>m = ���_�b n ���|�L��\n"
 "      <n>y = ���_�b n �~��|�L��\n"
 
-#: g10/keygen.c:1525
+#: g10/keygen.c:1537
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -3699,29 +3754,29 @@ msgstr ""
 "      <n>m = �b n ���|�L��\n"
 "      <n>y = �b n �~��|�L��\n"
 
-#: g10/keygen.c:1547
+#: g10/keygen.c:1559
 msgid "Key is valid for? (0) "
 msgstr "���_�����Ĵ����O�h�[�H (0) "
 
-#: g10/keygen.c:1549
+#: g10/keygen.c:1561
 msgid "Signature is valid for? (0) "
 msgstr "ñ�������Ĵ����O�h�[�H (0) "
 
-#: g10/keygen.c:1554
+#: g10/keygen.c:1566
 msgid "invalid value\n"
 msgstr "�L�Ī��ƭ�\n"
 
-#: g10/keygen.c:1559
+#: g10/keygen.c:1571
 #, c-format
 msgid "%s does not expire at all\n"
 msgstr "%s �������|�L��\n"
 
-#: g10/keygen.c:1566
+#: g10/keygen.c:1578
 #, c-format
 msgid "%s expires at %s\n"
 msgstr "%s �N�|�b %s �L��\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1584
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -3729,12 +3784,12 @@ msgstr ""
 "�p���t�εL�k��� 2038 �~�H�᪺����C\n"
 "���L�A���i�H���T�B�z���� 2106 �~���e���~���C\n"
 
-#: g10/keygen.c:1577
+#: g10/keygen.c:1589
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�H�W���T�ܡH (y/n) "
 
-#: g10/keygen.c:1620
+#: g10/keygen.c:1632
 #, fuzzy
 msgid ""
 "\n"
@@ -3750,44 +3805,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:1632
+#: g10/keygen.c:1644
 msgid "Real name: "
 msgstr "�u��m�W�G "
 
-#: g10/keygen.c:1640
+#: g10/keygen.c:1652
 msgid "Invalid character in name\n"
 msgstr "�m�W�t���L�Ī��r��\n"
 
-#: g10/keygen.c:1642
+#: g10/keygen.c:1654
 msgid "Name may not start with a digit\n"
 msgstr "�m�W���i�H�μƦr�}�Y\n"
 
-#: g10/keygen.c:1644
+#: g10/keygen.c:1656
 msgid "Name must be at least 5 characters long\n"
 msgstr "�m�W�ܤ֭n�����Ӧr�Ū�\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1664
 msgid "Email address: "
 msgstr "�q�l�l��a�}�G "
 
-#: g10/keygen.c:1663
+#: g10/keygen.c:1675
 msgid "Not a valid email address\n"
 msgstr "���O���Ī��q�l�l��a�}\n"
 
-#: g10/keygen.c:1671
+#: g10/keygen.c:1683
 msgid "Comment: "
 msgstr "�����G "
 
-#: g10/keygen.c:1677
+#: g10/keygen.c:1689
 msgid "Invalid character in comment\n"
 msgstr "�����t���L�Ī��r��\n"
 
-#: g10/keygen.c:1700
+#: g10/keygen.c:1712
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�p���b�ϥ� `%s' �r�����C\n"
 
-#: g10/keygen.c:1706
+#: g10/keygen.c:1718
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -3798,27 +3853,27 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1723
 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"
 
-#: g10/keygen.c:1727
+#: g10/keygen.c:1739
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:1737
+#: g10/keygen.c:1749
 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 "
 
-#: g10/keygen.c:1738
+#: g10/keygen.c:1750
 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 "
 
-#: g10/keygen.c:1757
+#: g10/keygen.c:1769
 msgid "Please correct the error first\n"
 msgstr "���q�����~\n"
 
-#: g10/keygen.c:1797
+#: g10/keygen.c:1809
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -3826,12 +3881,12 @@ msgstr ""
 "�p�ݭn�@�ӱK�X��ӫO�@�p���p�_�C\n"
 "\n"
 
-#: g10/keygen.c:1807
+#: g10/keygen.c:1819 g10/passphrase.c:1099
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:1813
+#: g10/keygen.c:1825
 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"
@@ -3843,7 +3898,7 @@ msgstr ""
 "�Ȼݭn�A������o�ӵ{���A�åB�ϥ� \"--edit-key\" �ﶵ�Y�i�C\n"
 "\n"
 
-#: g10/keygen.c:1835
+#: g10/keygen.c:1847
 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"
@@ -3854,54 +3909,50 @@ msgstr ""
 "�]���O�V����L�B���ʷƹ��BŪ�g�w�Ф������^\n"
 "�o�|���H���Ʀr���;�����h�����|��o���h���üơC\n"
 
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA ���_��|�� 1024 �줸�C\n"
-
-#: g10/keygen.c:2559
+#: g10/keygen.c:2571
 msgid "Key generation canceled.\n"
 msgstr "�w�������_���͡C\n"
 
-#: g10/keygen.c:2747 g10/keygen.c:2884
+#: g10/keygen.c:2759 g10/keygen.c:2896
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "���b�N���_�g�� `%s'\n"
 
-#: g10/keygen.c:2749 g10/keygen.c:2887
+#: g10/keygen.c:2761 g10/keygen.c:2899
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/keygen.c:2752 g10/keygen.c:2890
+#: g10/keygen.c:2764 g10/keygen.c:2902
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "���b�N�p�_�g�� `%s'\n"
 
-#: g10/keygen.c:2873
+#: g10/keygen.c:2885
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�䤣��i�g�����_�_�Ͱ�G %s\n"
 
-#: g10/keygen.c:2879
+#: g10/keygen.c:2891
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�䤣��i�g���p�_�_�Ͱ�G %s\n"
 
-#: g10/keygen.c:2897
+#: g10/keygen.c:2909
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�g�J���_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keygen.c:2904
+#: g10/keygen.c:2916
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�g�J�p�_�_�Ͱ� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keygen.c:2927
+#: g10/keygen.c:2939
 msgid "public and secret key created and signed.\n"
 msgstr "���_�M�p�_�w�g�Q�إߤ�ñ�p�F�C\n"
 
-#: g10/keygen.c:2938
+#: g10/keygen.c:2950
 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"
@@ -3909,57 +3960,57 @@ msgstr ""
 "�Ъ`�N�o����_����Ψӥ[�K���ΡC�p������ \"--edit-key\" ���O\n"
 "�Ӳ��ͦ��_�צ�C\n"
 
-#: g10/keygen.c:2950 g10/keygen.c:3065 g10/keygen.c:3180
+#: g10/keygen.c:2962 g10/keygen.c:3077 g10/keygen.c:3192
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���ͪ��_���ѡG %s\n"
 
-#: g10/keygen.c:3001 g10/keygen.c:3116 g10/sign.c:290
+#: g10/keygen.c:3013 g10/keygen.c:3128 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"
 
-#: g10/keygen.c:3003 g10/keygen.c:3118 g10/sign.c:292
+#: g10/keygen.c:3015 g10/keygen.c:3130 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"
 
-#: g10/keygen.c:3012 g10/keygen.c:3129
+#: g10/keygen.c:3024 g10/keygen.c:3141
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "�Ъ`�N�G�� v3 ���_�s�y�l�_�|���h OpenPGP �ۮe��\n"
 
-#: g10/keygen.c:3040 g10/keygen.c:3162
+#: g10/keygen.c:3052 g10/keygen.c:3174
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u���n�إ߶ܡH "
 
-#: g10/keygen.c:3315
+#: g10/keygen.c:3327
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�R�����_�϶��ɥ��ѤF�G %s\n"
 
-#: g10/keygen.c:3362
+#: g10/keygen.c:3374
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�L�k�إ� `%s' �G %s\n"
 
-#: g10/keygen.c:3385
+#: g10/keygen.c:3397
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "�Ъ`�N�G�p�_ %08lX �b %s �L���F\n"
 
-#: g10/keygen.c:3452
+#: g10/keygen.c:3464
 #, c-format
 msgid "length of RSA modulus is not %d\n"
 msgstr ""
 
-#: g10/keygen.c:3458
+#: g10/keygen.c:3470
 msgid "public exponent too large (more than 32 bits)\n"
 msgstr ""
 
-#: g10/keygen.c:3464 g10/keygen.c:3470
+#: g10/keygen.c:3476 g10/keygen.c:3482
 #, c-format
 msgid "length of an RSA prime is not %d\n"
 msgstr ""
@@ -4005,28 +4056,28 @@ msgstr "�_�Ͱ�"
 msgid "expired: %s)"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keylist.c:1431
+#: g10/keylist.c:1425
 msgid "Primary key fingerprint:"
 msgstr "�D�_�����G"
 
-#: g10/keylist.c:1433
+#: g10/keylist.c:1427
 msgid "     Subkey fingerprint:"
 msgstr "              �l�_�����G"
 
-#: g10/keylist.c:1440
+#: g10/keylist.c:1434
 msgid " Primary key fingerprint:"
 msgstr " �D�_�����G"
 
-#: g10/keylist.c:1442
+#: g10/keylist.c:1436
 msgid "      Subkey fingerprint:"
 msgstr "               �l�_�����G"
 
-#: g10/keylist.c:1446 g10/keylist.c:1450
+#: g10/keylist.c:1440 g10/keylist.c:1444
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "            ���_���� ="
 
-#: g10/keylist.c:1517
+#: g10/keylist.c:1511
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4380,7 +4431,7 @@ msgstr "�G�i��"
 msgid "textmode"
 msgstr "��r�Ҧ�"
 
-#: g10/mainproc.c:1672 g10/trustdb.c:499
+#: g10/mainproc.c:1672 g10/trustdb.c:528
 msgid "unknown"
 msgstr "����"
 
@@ -4411,28 +4462,40 @@ msgstr "�«� (PGP 2.x) ñ��\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�b proc_tree() ��������L�Ī� root �ʥ]\n"
 
-#: g10/misc.c:101
+#: g10/misc.c:105
 #, c-format
 msgid "can't disable core dumps: %s\n"
 msgstr "�L�k���t�ΰ���ɦL�֤��ɡG %s\n"
 
-#: g10/misc.c:121 g10/misc.c:149 g10/misc.c:221
+#: g10/misc.c:125 g10/misc.c:153 g10/misc.c:225
 #, fuzzy, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "�L�k�}���ɮסG %s\n"
 
-#: g10/misc.c:186
+#: g10/misc.c:190
 #, fuzzy, c-format
 msgid "fstat(%d) failed in %s: %s\n"
 msgstr "�H����Ʈw�GŪ������ (n=%d): %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "���Өϥι���ʪ��t��k�I\n"
+#: g10/misc.c:299
+#, fuzzy, c-format
+msgid "WARNING: using experimental public key algorithm %s\n"
+msgstr "�L�k�ާ@���}���_�t��k %d\n"
+
+#: g10/misc.c:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "���Q�ĥΪ��s�K�t��k"
+
+#: g10/misc.c:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s �A�K�n�t��k %s\n"
 
-#: g10/misc.c:324
-msgid "this cipher algorithm is deprecated; please use a more standard one!\n"
-msgstr "����ij�ϥγo�ӽs�K�t��k�F�д��Χ󥿦����I\n"
+#: g10/misc.c:334
+#, fuzzy, c-format
+msgid "WARNING: digest algorithm %s is deprecated\n"
+msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
 
 #: g10/misc.c:430
 msgid "the IDEA cipher plugin is not present\n"
@@ -4540,50 +4603,50 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d ���O���l�ʥ]�]�w�F����줸\n"
 
-#: g10/passphrase.c:465 g10/passphrase.c:512
+#: g10/passphrase.c:475 g10/passphrase.c:522
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent �b�����q�L�k�ϥ�\n"
 
-#: g10/passphrase.c:473
+#: g10/passphrase.c:483
 msgid "can't set client pid for the agent\n"
 msgstr "�L�k�]�w�N�z�{�������ϥΪ̺� pid\n"
 
-#: g10/passphrase.c:481
+#: g10/passphrase.c:491
 msgid "can't get server read FD for the agent\n"
 msgstr "�L�k���o�N�z�{���һݪ����A��Ū���ɮ״y�z\n"
 
-#: g10/passphrase.c:488
+#: g10/passphrase.c:498
 msgid "can't get server write FD for the agent\n"
 msgstr "�L�k���o�N�z�{���һݪ����A���g�J�ɮ״y�z\n"
 
-#: g10/passphrase.c:521
+#: g10/passphrase.c:531
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�Q�ܳy�� GPG_AGENT_INFO �����ܼ�\n"
 
-#: g10/passphrase.c:534
+#: g10/passphrase.c:544
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent ��w���� %d ���Q�䴩\n"
 
-#: g10/passphrase.c:555
+#: g10/passphrase.c:565
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�L�k�s���� `%s' �G %s\n"
 
-#: g10/passphrase.c:577
+#: g10/passphrase.c:587
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ���q�T���D\n"
 
-#: g10/passphrase.c:584 g10/passphrase.c:892 g10/passphrase.c:1004
+#: g10/passphrase.c:594 g10/passphrase.c:930 g10/passphrase.c:1042
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�N�z�{�������D �w ���b���ΥN�z�{��\n"
 
-#: g10/passphrase.c:684 g10/passphrase.c:1160
+#: g10/passphrase.c:698 g10/passphrase.c:1203
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�D�n���_ ID %08lX)"
 
-#: g10/passphrase.c:698
+#: g10/passphrase.c:712
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4594,41 +4657,41 @@ msgstr ""
 "\"%.*s\"\n"
 "%u �줸 %s ID %08lX �����_�A�إߩ� %s%s\n"
 
-#: g10/passphrase.c:723
+#: g10/passphrase.c:737
 msgid "Repeat passphrase\n"
 msgstr "�ЦA��J�@���K�X��\n"
 
-#: g10/passphrase.c:725
+#: g10/passphrase.c:739
 msgid "Enter passphrase\n"
 msgstr "�п�J�K�X��\n"
 
-#: g10/passphrase.c:763
+#: g10/passphrase.c:777
 msgid "passphrase too long\n"
 msgstr "�K�X��Ӫ�\n"
 
-#: g10/passphrase.c:776
+#: g10/passphrase.c:790
 msgid "invalid response from agent\n"
 msgstr "�N�z�{���Ǧ^�L�Ī��^��\n"
 
-#: g10/passphrase.c:791 g10/passphrase.c:886
+#: g10/passphrase.c:805 g10/passphrase.c:924
 msgid "cancelled by user\n"
 msgstr "�ѨϥΪ̨����F\n"
 
-#: g10/passphrase.c:796 g10/passphrase.c:975
+#: g10/passphrase.c:810 g10/passphrase.c:1013
 #, c-format
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
 
-#: g10/passphrase.c:1053 g10/passphrase.c:1211
+#: g10/passphrase.c:1094 g10/passphrase.c:1256
 #, fuzzy
-msgid "can't query password in batch mode\n"
+msgid "can't query passphrase in batch mode\n"
 msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
 
-#: g10/passphrase.c:1058 g10/passphrase.c:1216
+#: g10/passphrase.c:1101 g10/passphrase.c:1261
 msgid "Enter passphrase: "
 msgstr "�п�J�K�X��G "
 
-#: g10/passphrase.c:1141
+#: g10/passphrase.c:1184
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4638,17 +4701,17 @@ msgstr ""
 "�p�ݭn�U�C�ϥΪ̪��K�X��A�ׯ�Ѷ}�p�_�G\n"
 "\""
 
-#: g10/passphrase.c:1147
+#: g10/passphrase.c:1190
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u �줸 %s ID %08lX �����_�A�إߩ� %s"
 
-#: g10/passphrase.c:1156
+#: g10/passphrase.c:1199
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:1220
+#: g10/passphrase.c:1265
 msgid "Repeat passphrase: "
 msgstr "�ЦA��J�@���K�X��G "
 
@@ -4852,7 +4915,8 @@ msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
 
 #: g10/pkclist.c:521
-msgid "         This could mean that the signature is forgery.\n"
+#, fuzzy
+msgid "         This could mean that the signature is forged.\n"
 msgstr "         �o�ܦ��i����ܳo��ñ���O�Q���y���C\n"
 
 #: g10/pkclist.c:527
@@ -4953,28 +5017,28 @@ msgstr "�S�����Ī��a�}\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "��ƥ��Q�x�s�F�Х� \"--output\" �ﶵ���x�s����\n"
 
-#: g10/plaintext.c:134 g10/plaintext.c:139 g10/plaintext.c:157
+#: 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"
 
-#: g10/plaintext.c:445
+#: g10/plaintext.c:446
 msgid "Detached signature.\n"
 msgstr "�������C\n"
 
-#: g10/plaintext.c:449
+#: g10/plaintext.c:450
 msgid "Please enter name of data file: "
 msgstr "�п�J����ɪ��W�١G "
 
-#: g10/plaintext.c:477
+#: g10/plaintext.c:478
 msgid "reading stdin ...\n"
 msgstr "���b�q�зǿ�JŪ�� ...\n"
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:512
 msgid "no signed data\n"
 msgstr "�S���Qñ�p�L�����\n"
 
-#: g10/plaintext.c:525
+#: g10/plaintext.c:526
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�L�k�}�ҳQñ�p�L����� `%s'\n"
@@ -5278,49 +5342,44 @@ msgstr "%s ñ���ӦۡG \"%s\"\n"
 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"
 
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "���b�g�� `%s'\n"
-
-#: g10/sign.c:807
+#: g10/sign.c:808
 #, fuzzy, 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"
 
-#: g10/sign.c:899
+#: g10/sign.c:900
 msgid "signing:"
 msgstr "ñ�p�G"
 
-#: g10/sign.c:1006
+#: 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"
 
-#: g10/sign.c:1178
+#: g10/sign.c:1180
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �[�K�N�Q�ĥ�\n"
 
-#: g10/skclist.c:129 g10/skclist.c:191
+#: 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"
 
-#: g10/skclist.c:158
+#: g10/skclist.c:157
 #, fuzzy, c-format
 msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' �w���L�G���ƤF\n"
 
-#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#: g10/skclist.c:165 g10/skclist.c:175 g10/skclist.c:184
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' �w���L�G %s\n"
 
-#: g10/skclist.c:171
+#: g10/skclist.c:170
 msgid "skipped: secret key already present\n"
 msgstr "�w���L�G�p�_�w�g�s�b\n"
 
-#: g10/skclist.c:186
+#: 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"
@@ -5506,12 +5565,12 @@ msgstr "%s: ���[�Y���O���ɥ��ѡG %s\n"
 msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 msgstr "�H����Ʈw�l���F�F�а��� \"gpg --fix-trustdb\" �C\n"
 
-#: g10/textfilter.c:134
+#: g10/textfilter.c:143
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
 msgstr "�L�k�B�z���� %d �r�Ū���r�C\n"
 
-#: g10/textfilter.c:231
+#: g10/textfilter.c:240
 #, c-format
 msgid "input line longer than %d characters\n"
 msgstr "��J�C�� %d �r���٪�\n"
@@ -5561,85 +5620,120 @@ msgstr ""
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:501
+#: g10/trustdb.c:503
+msgid "10 translator see trustdb.c:uid_trust_string_fixed"
+msgstr ""
+
+#: g10/trustdb.c:505
+#, fuzzy
+msgid "[ revoked]"
+msgstr "[�w�M�P]"
+
+#: g10/trustdb.c:507
+#, fuzzy
+msgid "[ expired]"
+msgstr "[�w�L��]"
+
+#: g10/trustdb.c:511
+#, fuzzy
+msgid "[ unknown]"
+msgstr "����"
+
+#: g10/trustdb.c:512
+msgid "[  undef ]"
+msgstr ""
+
+#: g10/trustdb.c:513
+msgid "[marginal]"
+msgstr ""
+
+#: g10/trustdb.c:514
+msgid "[  full  ]"
+msgstr ""
+
+#: g10/trustdb.c:515
+msgid "[ultimate]"
+msgstr ""
+
+#: g10/trustdb.c:530
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:502
+#: g10/trustdb.c:531
 #, fuzzy
 msgid "never"
 msgstr "�û����L��"
 
-#: g10/trustdb.c:503
+#: g10/trustdb.c:532
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:504
+#: g10/trustdb.c:533
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:534
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:545
+#: g10/trustdb.c:574
 msgid "no need for a trustdb check\n"
 msgstr "���ݭn�ˬd�H����Ʈw\n"
 
-#: g10/trustdb.c:551 g10/trustdb.c:2112
+#: g10/trustdb.c:580 g10/trustdb.c:2141
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�U���H����Ʈw�ˬd�N�� %s �i��\n"
 
-#: g10/trustdb.c:560
+#: g10/trustdb.c:589
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ݭn�ˬd�H����Ʈw\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:604
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ݭn�ˬd�H����Ʈw\n"
 
-#: g10/trustdb.c:793 g10/trustdb.c:1231
+#: g10/trustdb.c:822 g10/trustdb.c:1260
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "���_ %08lX �S���Q���G %s\n"
 
-#: g10/trustdb.c:988
+#: g10/trustdb.c:1017
 msgid "please do a --check-trustdb\n"
 msgstr "��@�� --check-trustdb\n"
 
-#: g10/trustdb.c:992
+#: g10/trustdb.c:1021
 msgid "checking the trustdb\n"
 msgstr "���b�ˬd�H����Ʈw\n"
 
-#: g10/trustdb.c:1856
+#: g10/trustdb.c:1885
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "�w�g�B�z�F %d ����_�]�@�p�w�ѨM�F %d �����ĩʡ^\n"
 
-#: g10/trustdb.c:1920
+#: g10/trustdb.c:1949
 msgid "no ultimately trusted keys found\n"
 msgstr "�S������������H�������_\n"
 
-#: g10/trustdb.c:1934
+#: g10/trustdb.c:1963
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "�����H�����_ %08lX �����_�S���Q���\n"
 
-#: g10/trustdb.c:1957
+#: g10/trustdb.c:1986
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2043
+#: g10/trustdb.c:2072
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2118
+#: g10/trustdb.c:2147
 #, fuzzy, 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"
@@ -5949,6 +6043,59 @@ msgstr "�|���ҥΦw�����O����e�A���i��i��ާ@\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
 
+#~ 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"
 
@@ -6076,12 +6223,6 @@ msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? �ˬd�M�P�ɵo�Ͱ��D�G %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[�w�M�P]"
-
-#~ msgid "[expired] "
-#~ msgstr "[�w�L��]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [���Ĵ����G %s]"