gnupg/po (30 files)

cvs user wk cvs at cvs.gnupg.org
Fri Dec 10 23:17:19 CET 2004


    Date: Friday, December 10, 2004 @ 23:21:02
  Author: wk
    Path: /cvs/gnupg/gnupg/po

   Added: LINGUAS.contrib
Modified: ChangeLog LINGUAS be.po ca.po cs.po da.po de.po el.po eo.po
          es.po et.po fi.po fr.po gl.po hu.po id.po it.po ja.po nl.po
          pl.po pt.po pt_BR.po ro.po ru.po sk.po sv.po tr.po zh_CN.po
          zh_TW.po

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

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


-----------------+
 ChangeLog       |   18 
 LINGUAS         |    1 
 LINGUAS.contrib |    4 
 be.po           | 1281 +++++++-------
 ca.po           | 1378 ++++++++-------
 cs.po           | 3240 +++++++++++++++---------------------
 da.po           | 1308 +++++++-------
 de.po           | 1372 ++++++++-------
 el.po           | 1381 ++++++++-------
 eo.po           | 1361 ++++++++-------
 es.po           | 1371 ++++++++-------
 et.po           | 1365 ++++++++-------
 fi.po           | 1369 ++++++++-------
 fr.po           | 3346 ++++++++++++++++---------------------
 gl.po           | 1369 ++++++++-------
 hu.po           | 1367 ++++++++-------
 id.po           | 1369 ++++++++-------
 it.po           | 1369 ++++++++-------
 ja.po           | 3720 ++++++++++++++++++-----------------------
 nl.po           |  191 +-
 pl.po           | 1373 ++++++++-------
 pt.po           | 1366 ++++++++-------
 pt_BR.po        | 1365 ++++++++-------
 ro.po           | 1369 ++++++++-------
 ru.po           | 1367 ++++++++-------
 sk.po           | 1373 ++++++++-------
 sv.po           | 1916 +++++++++++----------
 tr.po           | 1372 ++++++++-------
 zh_CN.po        | 4850 ++++++++++++++++++++++++------------------------------
 zh_TW.po        | 1361 ++++++++-------
 30 files changed, 23637 insertions(+), 22255 deletions(-)


Index: gnupg/po/ChangeLog
diff -u gnupg/po/ChangeLog:1.58 gnupg/po/ChangeLog:1.59
--- gnupg/po/ChangeLog:1.58	Wed Oct 27 18:32:51 2004
+++ gnupg/po/ChangeLog	Fri Dec 10 23:21:02 2004
@@ -1,3 +1,9 @@
+2004-12-10  Werner Koch  <wk at g10code.com>
+
+	* 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  <wk at g10code.com>
 
 	* LINGUAS: Better don't have comments in this file.
@@ -283,7 +289,7 @@
 
 2000-06-07 18:26:58  Werner Koch  (wk at habibti.openit.de)
 
-  * fr.po: New version from Gaël
+  * fr.po: New version from Gaël
 
 2000-05-02 10:44:42  Werner Koch  (wk at habibti.openit.de)
 
@@ -355,7 +361,7 @@
 
 Thu Sep 23 06:26:28 1999  Werner Koch  (wk at gnupg.org)
 
-	* fr.po: Updated by Gaël.
+	* fr.po: Updated by Gaël.
 
 Sat Sep 18 11:49:51 1999  Werner Koch  (wk at gnupg.org)
 
@@ -379,7 +385,7 @@
 
 	* 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  <wk at isil.d.shuttle.de>
 
@@ -390,7 +396,7 @@
 	* 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  <wk at isil.d.shuttle.de>
 
@@ -519,7 +525,7 @@
 
 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 @@
 
 
 
- 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
Index: gnupg/po/LINGUAS
diff -u gnupg/po/LINGUAS:1.3 gnupg/po/LINGUAS:1.4
--- gnupg/po/LINGUAS:1.3	Wed Oct 27 18:32:51 2004
+++ gnupg/po/LINGUAS	Fri Dec 10 23:21:02 2004
@@ -8,7 +8,6 @@
 hu 
 id it
 ja
-nl
 pl pt_BR pt
 ro ru 
 sk sv
Index: gnupg/po/LINGUAS.contrib
diff -u /dev/null gnupg/po/LINGUAS.contrib:1.1
--- /dev/null	Fri Dec 10 23:21:04 2004
+++ gnupg/po/LINGUAS.contrib	Fri Dec 10 23:21:02 2004
@@ -0,0 +1,4 @@
+# these are languages files for which we don't have a proper disclaimer
+
+nl.po
+
Index: gnupg/po/be.po
diff -u gnupg/po/be.po:1.7 gnupg/po/be.po:1.8
--- gnupg/po/be.po:1.7	Thu Oct 28 11:06:50 2004
+++ gnupg/po/be.po	Fri Dec 10 23:21:02 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <nab at mail.by>\n"
 "Language-Team: Belarusian <i18n at mova.org>\n"
@@ -15,11 +15,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1086,15 +1171,15 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs at gnu.org>.\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 @@
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1112,478 +1197,478 @@
 "\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\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 @@
 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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "\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 @@
 "\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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #~ 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"
 
Index: gnupg/po/ca.po
diff -u gnupg/po/ca.po:1.9 gnupg/po/ca.po:1.10
--- gnupg/po/ca.po:1.9	Thu Oct 28 11:06:50 2004
+++ gnupg/po/ca.po	Fri Dec 10 23:21:01 2004
@@ -27,7 +27,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4rc\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <jordi at gnu.org>\n"
 "Language-Team: Catalan <ca at dodds.net>\n"
@@ -35,12 +35,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 
 # 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 @@
 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 @@
 # 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 # 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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs at gnu.org>.\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 @@
 # 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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 # 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 @@
 "�%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 @@
 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 @@
 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 @@
 "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 @@
 
 # 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 # 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 @@
 "�%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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/cs.po
diff -u gnupg/po/cs.po:1.12 gnupg/po/cs.po:1.13
--- gnupg/po/cs.po:1.12	Thu Oct 28 11:06:50 2004
+++ gnupg/po/cs.po	Fri Dec 10 23:21:01 2004
@@ -3,25 +3,20 @@
 # Magda Procházková <magda at math.muni.cz> 2001, Roman Pavlik <rp at tns.cz> 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: gnupg-i18n at gnupg.org\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 <rp at tns.cz>\n"
 "Language-Team: Czech <translations.cs at gnupg.cz>\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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "¹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: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:638
+#: 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/cardglue.c:704
+#, fuzzy
+msgid "Repeat this PIN: "
+msgstr "Opakujte heslo: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Chyby oznamte, prosím, na adresu <gnupg-bugs at gnu.org>.\n"
-"Pøipomínky k pøekladu <translations.cs at gnupg.cz>.\n"
+"Pøipomínky k pøekladu <rp at tns.cz>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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] "
-
-#: 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 "èíslo karty: "
 
-#: 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Magda Prochazkova (student) <magda at domena.cz>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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: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:314
+#, fuzzy, c-format
+msgid "WARNING: using experimental cipher algorithm %s\n"
+msgstr "¹ifrovací algoritmus není implementová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:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "podpis %s, 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 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 @@
 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 @@
 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 @@
 msgstr "Soubor `%s' existuje. "
 
 #: g10/openfile.c:86
-#, fuzzy
 msgid "Overwrite? (y/N) "
 msgstr "Pøepsat (a/N)? "
 
@@ -4599,9 +4572,9 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "\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 @@
 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 @@
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Aktuální pøíjemci:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -5017,9 +4978,9 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "# (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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #, 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 @@
 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 @@
 
 #: 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 @@
 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 "can't open %s: %s\n"
-#~ msgstr "nelze otevøít %s: %s\n"
-
-#, 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"
-#~ 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"
-
-#~ msgid "%s: can't access: %s\n"
-#~ msgstr "%s: nemohu pøistoupit k: %s\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\"."
-#~ 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 "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "hashovací algoritmus `%s' je v tomto release read-only\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)"
-
-#~ 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 "[%8.8s] "
+#~ msgstr "[%8.8s]"
 
 #~ 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"
-#~ msgstr ""
-#~ "podepsat klíè lokálnì a bez mo¾nosti\n"
-#~ " revokace podpisu"
-
-#~ 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"
+#~ "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 ""
-#~ "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"
+#~ "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 "use the gpg-agent"
-#~ msgstr "pou¾ijte gpg-agenta"
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "Klíè DSA musí mít velikost od 512 do 1024 bitù.\n"
 
-#~ 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"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 #~ 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íè"
+#~ "velikost klíèe je pøíli¹ malá; minimální dovolená velikost pro RSA je "
+#~ "1024 bitù.\n"
 
-#~ msgid "|HOST|use this keyserver to lookup keys"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
 #~ 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"
+#~ "velikost klíèe je pøíli¹ malá; minimální dovolená velikost je 768 bitù.\n"
 
-#~ 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"
-
-#~ 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"
+#~ "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 "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 ""
-#~ "key %08lX: this is a PGP generated ElGamal key which is NOT secure for "
-#~ "signatures!\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 "Experimental algorithms should not be used!\n"
+#~ msgstr "Experimentální algoritmy by se nemìly pou¾ívat!\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."
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
 #~ 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"
Index: gnupg/po/da.po
diff -u gnupg/po/da.po:1.17 gnupg/po/da.po:1.18
--- gnupg/po/da.po:1.17	Thu Oct 28 11:06:50 2004
+++ gnupg/po/da.po	Fri Dec 10 23:21:01 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <birger.langkjer at image.dk>\n"
 "Language-Team: Danish <dansk at klid.dk>\n"
@@ -16,11 +16,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Rapportér venligst fejl til <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\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 @@
 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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "\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 @@
 "    \"%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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "%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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 "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"
 
Index: gnupg/po/de.po
diff -u gnupg/po/de.po:1.97 gnupg/po/de.po:1.98
--- gnupg/po/de.po:1.97	Thu Oct 28 11:06:50 2004
+++ gnupg/po/de.po	Fri Dec 10 23:20:54 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <koch at u32.de>\n"
 "Language-Team: German <de at li.org>\n"
@@ -13,11 +13,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "(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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <gnupg-bugs at gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de at li.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 
 # 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "         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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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: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: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: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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/el.po
diff -u gnupg/po/el.po:1.13 gnupg/po/el.po:1.14
--- gnupg/po/el.po:1.13	Thu Oct 28 11:06:49 2004
+++ gnupg/po/el.po	Fri Dec 10 23:20:54 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <madf at hellug.gr>\n"
 "Language-Team: Greek <nls at tux.hellug.gr>\n"
@@ -14,12 +14,6 @@
 "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 @@
 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 @@
 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 @@
 "íá áðáó÷ïëåßôå ôï ëåéôïõñãéêü óýóôçìá ìÝ÷ñé áõôü íá óõãêåíôñþóåé\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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "ï åîáíáãêáóìüò óõììåôñéêïý áëãüñéèìïõ %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 @@
 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 @@
 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 @@
 "@\n"
 "(äåßôå ôç óåëßäá man ãéá ìéá ðëÞñç ëßóôá åíôïëþí êáé åðéëïãþí)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1134,15 +1220,15 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "ÁíáöÝñåôå ôá ðñïâëÞìáôá óôï <gnupg-bugs at gnu.org>\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 @@
 "õðïãñáöÞ, Ýëåã÷ïò, êñõðôïãñÜöçóç Þ áðïêñõðôïãñÜöçóç\n"
 "ç ðñïêáèïñéóìÝíç ëåéôïõñãßá åîáñôÜôáé áðü ôá äåäïìÝíá åéóüäïõ\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1160,474 +1246,474 @@
 "\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 @@
 "Ýíá üíïìá óçìåßùóçò ìðïñåß íá ðåñéÝ÷åé ìüíï åêôõðþóéìïõò ÷áñáêôÞñåò êáé êåíÜ "
 "êáé íá ëÞãåé ìå Ýíá '='\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "ÐëçêôñïëïãÞóôå ôçí íÝá öñÜóç êëåéäß ãéá áõôü ôï ìõóôéêü êëåéäß.\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 @@
 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 @@
 "Ç åããõñüôçôá ôïõ áðåéêïíéæüìåíïõ êëåéäéïý äåí åßíáé áðáñáßôçôá óùóôÞ\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 @@
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: äåí Ý÷åé óçìåéùèåß 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 @@
 "ÐÑÏÅÉÄÏÐÏÉÇÓÇ: Áõôü Ýéíáé Ýíá êëåéäß ôýðïõ 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 @@
 "               êáèïñéóìÝíïõ áíáêëçôÞ ìðïñåß íá êÜíåé ìåñéêÝò åêäüóåéò 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 @@
 "Åßóôå óßãïõñïé üôé èÝëåôå íá ïñßóåôå Ýíá êëåéäß óáí äéïñéóìÝíï áíáêëçôÞ; (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 @@
 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 @@
 
 #: 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"
+msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
-"ôï ìÝãåèïò êëåéäéïý åßíáé ðïëý ìåãÜëï, %d åßíáé ç ìÝãéóôç ôéìÞ ðïõ "
-"åðéôñÝðåôáé.\n"
 
-#: g10/keygen.c:1444
-msgid ""
-"Keysizes larger than 2048 are not suggested because\n"
-"computations take REALLY 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 @@
 "      <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 @@
 "      <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 @@
 "Ôï óýóôçìá óáò äåí ìðïñåß íá áðåéêïíßóåé çìåñïìçíßåò ðÝñá ôïõ 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 @@
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln at athens.gr>\"\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 @@
 "    \"%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 @@
 "×ñåéÜæåóôå ìéá ÖñÜóç êëåéäß ãéá íá ðñïóôáôåýóåôå ôï ìõóôéêü êëåéäß.\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 @@
 "üðïôå èÝëåôå, ìå ôçí åðéëïãÞ \"--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 @@
 "ôïõò äßóêïõò) êáôá ôç äéÜñêåéá õðïëïãéóìïý ðñþôùí áñéèìþí. Áõôü äßíåé\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 @@
 "Ìðïñåßôå íá ÷ñçóéìïðïéÞóåôå ôçí åíôïëÞ \"--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 @@
 "ôï êëåéäß äçìéïõñãÞèçêå %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 @@
 "ôï êëåéäß äçìéïõñãÞèçêå %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 @@
 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 @@
 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 @@
 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:314
+#, fuzzy, 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 õðïãñáöÞ, áëãüñéèìïò ðåñßëçøçò %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 @@
 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 @@
 "\"%.*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 @@
 "×ñåéÜæåóôå ìéá öñÜóç êëåéäß ãéá íá îåêëåéäþóåôå ôï ìõóôéêü êëåéäß\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 @@
 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 @@
 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 @@
 "ìðïñåßôå íá õðïãñÜøåôå-áðïêïììÝíá ìå êëåéäéÜ ôýðïõ 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 @@
 "ï åîáíáãêáóìüò ôïõ áëãüñéèìïõ ðåñßëçøçò %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 @@
 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 @@
 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 @@
 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 @@
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? ðñüâëçìá óôïí Ýëåã÷ï áíÜêëçóçò: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[áíáêëçìÝíï]"
-
-#~ msgid "[expired] "
-#~ msgstr "[ëçãìÝíï]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [ëÞãåé: %s]"
Index: gnupg/po/eo.po
diff -u gnupg/po/eo.po:1.16 gnupg/po/eo.po:1.17
--- gnupg/po/eo.po:1.16	Thu Oct 28 11:06:49 2004
+++ gnupg/po/eo.po	Fri Dec 10 23:20:54 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <edmundo at rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo at lists.sourceforge.net>\n"
@@ -14,11 +14,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (la poeto) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "þ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 @@
 "þ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 @@
 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 @@
 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 @@
 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: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: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: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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 "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]"
 
Index: gnupg/po/es.po
diff -u gnupg/po/es.po:1.12 gnupg/po/es.po:1.13
--- gnupg/po/es.po:1.12	Thu Oct 28 11:06:49 2004
+++ gnupg/po/es.po	Fri Dec 10 23:20:53 2004
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <jsuarez at ono.com>\n"
 "Language-Team: Spanish <es at li.org>\n"
@@ -18,11 +18,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 # 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 # 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/et.po
diff -u gnupg/po/et.po:1.12 gnupg/po/et.po:1.13
--- gnupg/po/et.po:1.12	Thu Oct 28 11:06:49 2004
+++ gnupg/po/et.po	Fri Dec 10 23:20:53 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <Toomas.Soome at microlink.ee>\n"
 "Language-Team: Estonian <et at li.org>\n"
@@ -14,11 +14,6 @@
 "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 @@
 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 @@
 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 @@
 "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:1301
+#: 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: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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/fi.po
diff -u gnupg/po/fi.po:1.7 gnupg/po/fi.po:1.8
--- gnupg/po/fi.po:1.7	Thu Oct 28 11:06:49 2004
+++ gnupg/po/fi.po	Fri Dec 10 23:20:53 2004
@@ -22,7 +22,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <Tommi.Vainikainen at iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -30,11 +30,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "(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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "     <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 @@
 "     <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 @@
 "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 @@
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen at osoite.fi>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "\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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/fr.po
diff -u gnupg/po/fr.po:1.66 gnupg/po/fr.po:1.67
--- gnupg/po/fr.po:1.66	Thu Oct 28 11:06:49 2004
+++ gnupg/po/fr.po	Fri Dec 10 23:20:52 2004
@@ -1,35 +1,28 @@
 # GnuPG French translation
-# Copyright (C) 1998-2003 Free Software Foundation, Inc.
+# Copyright (C) 1998-2004 Free Software Foundation, Inc.
 # Gaël Quéri <gael at lautre.net>, 1998.
 #
 # Thanks to Rémi Guyomarch <rguyom at mail.dotcom.fr> and <nmorant at amadeus.net>
 # for pointing me out some errors.
 #
-# $Id: fr.po,v 1.66 2004/10/28 09:06:49 wk Exp $
+# $Id: fr.po,v 1.67 2004/12/10 22:20:52 wk Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.5\n"
+"Project-Id-Version: gnupg 1.3.93-cvs\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <gael at lautre.net>\n"
 "Language-Team: French <traduc at traduc.org>\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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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: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:638
+#: 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/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: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"
@@ -701,13 +769,13 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies à <gnupg-bugs at gnu.org> (en anglais)\n"
 "et tout problème de traduction à <traduc at traduc.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "\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 @@
 "\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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) "
+msgid "   (%d) RSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (indiquez vous-même les capacités)\n"
 
-#: 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"
-
-#: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "   « Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de> »\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "Les algorithmes expérimentaux ne devraient pas être utilisé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: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 "signature %s, algorithme de hachage %s\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 @@
 
 #: 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 
 #: g10/pkclist.c:802
 msgid "Current recipients:\n"
-msgstr ""
+msgstr "Récipients actuels:\n"
 
 #: g10/pkclist.c:828
 msgid ""
@@ -5084,7 +5081,7 @@
 
 #: 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "(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 @@
 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 @@
 "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 @@
 "# (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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #, 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 @@
 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 @@
 
 #: 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 @@
 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\"."
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
 #~ 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)"
+#~ "l'algorithme de hachage `%s' ne marche qu'en lecture seule dans cette\n"
+#~ "version\n"
 
-#~ 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 "[%8.8s] "
+#~ msgstr "[%8.8s] "
 
 #~ msgid ""
-#~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\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 ""
-#~ "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"
+#~ "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 "unattended trust database update"
-#~ msgstr "mise à jour inattendue de la base de confiance"
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 
-#~ 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"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
 #~ 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"
+#~ "taille trop petite; 1024 est la plus petite valeur permise pour RSA.\n"
 
-#~ msgid "|NAME|use cipher algorithm NAME for passphrases"
-#~ msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "taille trop petite; 768 est la plus petite valeur permise.\n"
 
-#~ 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"
-#~ msgstr ""
-#~ "l'algorithme de compression `%s' ne fonctionne qu'en lecture pour\n"
-#~ "cette 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 ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\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"
-
-#~ msgid "key %08lX: not a rfc2440 key - skipped\n"
-#~ msgstr "clé %08lX: ce n'est pas une clé rfc2440 - ignorée\n"
-
-#~ msgid ""
-#~ "NOTE: Elgamal primary key detected - this may take some time to import\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"
-
-#~ msgid "success sending to `%s' (status=%u)\n"
-#~ msgstr "l'envoi à `%s' s'est déroulé avec succès (résultat=%u)\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"
-#~ msgstr ""
-#~ "la clé %08lX a été créée %lu secondes dans le futur (rupture\n"
-#~ "spatio-temporelle ou problème d'horloge\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"
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
 #~ msgstr ""
-#~ "la signature de %08lX pour la clé de signature Elgamal %08lX a été\n"
-#~ "ignorée\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 "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 "Experimental algorithms should not be used!\n"
+#~ msgstr "Les algorithmes expérimentaux ne devraient pas être utilisés !\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."
+#~ "this cipher algorithm is deprecated; please use a more standard one!\n"
 #~ 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 ""
-#~ "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 ""
-#~ "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"
Index: gnupg/po/gl.po
diff -u gnupg/po/gl.po:1.12 gnupg/po/gl.po:1.13
--- gnupg/po/gl.po:1.12	Thu Oct 28 11:06:49 2004
+++ gnupg/po/gl.po	Fri Dec 10 23:20:52 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <jtarrio at trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion at ceu.fi.udc.es>\n"
@@ -14,11 +14,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs at gnu.org>,\n"
 "e dos erros na traducción a <proxecto at trasno.net>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "     \"Heinrich Heime (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/hu.po
diff -u gnupg/po/hu.po:1.7 gnupg/po/hu.po:1.8
--- gnupg/po/hu.po:1.7	Thu Oct 28 11:06:49 2004
+++ gnupg/po/hu.po	Fri Dec 10 23:20:52 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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ó <nfl at nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
@@ -14,11 +14,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "A hibákat (angolul) a <gnupg-bugs at gnu.org> 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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "Í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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "          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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (a költõ) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "%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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/id.po
diff -u gnupg/po/id.po:1.17 gnupg/po/id.po:1.18
--- gnupg/po/id.po:1.17	Thu Oct 28 11:06:49 2004
+++ gnupg/po/id.po	Fri Dec 10 23:20:51 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <tedi_h at gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id at lists.sourceforge.net>\n"
@@ -16,11 +16,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "     <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 @@
 "     <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 @@
 "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 @@
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/it.po
diff -u gnupg/po/it.po:1.70 gnupg/po/it.po:1.71
--- gnupg/po/it.po:1.70	Thu Oct 28 11:06:49 2004
+++ gnupg/po/it.po	Fri Dec 10 23:20:50 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <md at linux.it>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -14,11 +14,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "            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 @@
 "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 @@
 "            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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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: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: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: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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/ja.po
diff -u gnupg/po/ja.po:1.17 gnupg/po/ja.po:1.18
--- gnupg/po/ja.po:1.17	Thu Oct 28 11:06:49 2004
+++ gnupg/po/ja.po	Fri Dec 10 23:20:45 2004
@@ -1,31 +1,26 @@
 # Japanese messages for GnuPG
-# Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
-# IIDA Yosiaki <iida at gnu.org>, 1999, 2000, 2002, 2003.
+# Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# IIDA Yosiaki <iida at gnu.org>, 1999, 2000, 2002, 2003, 2004.
 # Yoshihiro Kajiki <kajiki at ylug.org>, 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: gnupg-i18n at gnupg.org\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 <iida at gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja at lists.sourceforge.net>\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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "ÅëºÜ¤µ¤ì¤Æ¤¤¤ëÍð¿ôÀ¸À®»Ò¤Ï¡¢°Å¹æÍѤȤ·¤Æ¤Ï¤ª¤½¤Þ¤Ä¤Ç¡¢\n"
 "¶¯¤¤Íð¿ô¤¬¤Ç¤­¤Þ¤»¤ó!\n"
 "\n"
-"¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀÚ»ÈÍѤ·¤Æ¤Ï¤¤¤±¤Þ¤»¤ó!!\n"
+"¤³¤Î¥×¥í¥°¥é¥à¤ÎÀ¸À®¤·¤¿¥Ç¡¼¥¿¤ò°ìÀڻȤäƤϤ¤¤±¤Þ¤»¤ó!!\n"
 "\n"
 
 #: cipher/rndegd.c:204
@@ -128,89 +124,145 @@
 "½½Ê¬¤ÊŤµ¤ÎÍð¿ô¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡£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:1021
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "¿·¤·¤¤PIN"
 
-#: g10/app-openpgp.c:1301
+#: 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:1812
+#: 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¤ÎË¡(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 @@
 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 @@
 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 @@
 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:638
+#: g10/cardglue.c:688
+#, fuzzy
+msgid "Enter New PIN: "
+msgstr "PIN¤ÎÆþÎÏ: "
+
+#: 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/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+msgid "Repeat this PIN: "
+msgstr "PIN¤òºÆÆþÎÏ: "
+
+#: 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 @@
 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 "³°Éô¥×¥í¥°¥é¥à¤Î¸Æ½Ð¤·¤Ï¡¢»ÈÍѶػߤǤ¹¡£\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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 "(¥³¥Þ¥ó¥É¤È¥ª¥×¥·¥ç¥óÁ´Éô¤Î°ìÍ÷¤Ï¡¢\n"
 "¥Þ¥Ë¥å¥¢¥ë¡¦¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1126,15 +1172,15 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "¥Ð¥°¤ò¸«¤Ä¤±¤¿¤é <gnupg-bugs at gnu.org> ¤Þ¤Ç¤´Êó¹ð¤¯¤À¤µ¤¤¡£\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 @@
 msgstr ""
 "½ñ¼°: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n"
 "½ð̾¡¢¸¡ºº¡¢°Å¹æ²½¤äÉü¹æ\n"
-"´ûÄê¤ÎÆ°ºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
+"´ûÄê¤ÎÁàºî¤Ï¡¢ÆþÎϥǡ¼¥¿¤Ë°Í¸\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1152,516 +1198,504 @@
 "\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 @@
 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 @@
 "Check signatures against known trusted keys\n"
 msgstr ""
 "¹½Ê¸: gpg [¥ª¥×¥·¥ç¥ó] [¥Õ¥¡¥¤¥ë]\n"
-"¿®ÍѤ·¤¿¸°¤Ç½ð̾¤ò¸¡ºº\n"
+"´ûÃΤο®ÍѤ·¤¿¸°¤Ç½ð̾¤ò¸¡ºº\n"
 
 #: g10/helptext.c:48
 msgid ""
@@ -1699,7 +1733,7 @@
 "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 @@
 "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 @@
 "\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 @@
 "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 @@
 #: 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 @@
 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 @@
 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 @@
 "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 @@
 "    ¤Æ¡¢(ÅŻҥ᡼¥ë¤Î¸ò´¹¤Ê¤É¤Ç) ¸°¤ÎÅŻҥ᡼¥ë¡¦¥¢¥É¥ì¥¹¤¬\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 @@
 msgstr ""
 "¤³¤Î½ð̾¤È°ìÃפ¹¤ë¸°¤òÊÝÍ­¤·¤Æ¤¤¤Ê¤¤¤Î¤Ç¡¢¤³¤Î½ð̾¤Ï¸¡ºº¤Ç¤­¤Þ¤»¤ó¡£\n"
 "¤½¤Î¸°¤¬»ÈÍѤµ¤ì¤ë¤Þ¤Ç¤Ï¡¢¤¢¤Ê¤¿¤Ï¤³¤Î½ð̾¤Îºï½ü¤òÊÝα¤¹¤ë¤Ù¤­¤Ç¤¹¡£\n"
-"¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢Â¾¤Î¾ÚÌÀ¤µ¤ì¤¿¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë¤«¤â\n"
-"¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£"
+"¤Ê¤¼¤Ê¤é¡¢¤³¤Î½ð̾¤Î¸°¤Ï¡¢¤â¤¦¾ÚÌÀ¤µ¤ì¤¿Â¾¤Î¸°¤Ç¿®ÍѤÎÎؤò·ÁÀ®¤¹¤ë\n"
+"¤«¤â¤·¤ì¤Ê¤¤¤«¤é¤Ç¤¹¡£"
 
 #: g10/helptext.c:210
 msgid ""
@@ -1934,7 +1976,7 @@
 "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 @@
 
 #: 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 @@
 "      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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "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 @@
 #: 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 "¤³¤ÎÈëÌ©¸°¤Î¿·¤·¤¤¥Ñ¥¹¥Õ¥ì¡¼¥º¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£\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 @@
 "\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 @@
 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 @@
 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 @@
 
 #: g10/keyedit.c:1277
 msgid "change the expire date"
-msgstr "Í­¸ú´ü¸Â¤ÎÊѹ¹"
+msgstr "ËþλÆü¤ÎÊѹ¹"
 
 #: g10/keyedit.c:1278
 msgid "primary"
@@ -2926,7 +2942,7 @@
 
 #: g10/keyedit.c:1279
 msgid "toggle between secret and public key listing"
-msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤ÎÀÚÂؤ¨"
+msgstr "ÈëÌ©¸°¤È¸ø³«¸°¤Î°ìÍ÷¤Îȿž"
 
 #: g10/keyedit.c:1281
 msgid "t"
@@ -2965,14 +2981,12 @@
 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 @@
 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 @@
 
 #: 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 
 #: 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 ""
-
-#: 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·Á¼°¥æ¡¼¥¶¡¼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 @@
 "·Ù¹ð: ¤³¤ì¤Ï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 @@
 "·Ù¹ð: ¤³¤ì¤Ï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 @@
 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 @@
 
 #: 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) "
+msgid "   (%d) RSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (Æȼ«Ç½ÎϤòÀßÄê)\n"
 
-#: 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"
-
-#: 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 @@
 "      <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"
+"¸°¤ÎÍ­¸ú´ü¸Â¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
+"         0 = ¸°¤Ï̵´ü¸Â\n"
+"      <n>  = ¸°¤Ï n Æü´Ö¤ÇËþλ\n"
+"      <n>w = ¸°¤Ï n ½µ´Ö¤ÇËþλ\n"
+"      <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"
@@ -3714,50 +3667,48 @@
 "      <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"
+"½ð̾¤ÎÍ­¸ú´ü¸Â¤ò»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
+"         0 = ½ð̾¤Ï̵´ü¸Â\n"
+"      <n>  = ½ð̾¤Ï n Æü´Ö¤ÇËþλ\n"
+"      <n>w = ½ð̾¤Ï n ½µ´Ö¤ÇËþλ\n"
+"      <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"
+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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "\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 @@
 "ÈëÌ©¸°¤òÊݸ¤ë¤¿¤á¤Ë¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¤¤¤ê¤Þ¤¹¡£\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 @@
 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 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·Ðͳ¤Ç²óÉü¤Ç¤­¤Þ¤»¤ó: %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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 #: 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 @@
 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 @@
 
 #: 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:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\n"
+#: g10/misc.c:314
+#, fuzzy, 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"
-msgstr ""
-"¤³¤Î°Å¹æ¥¢¥ë¥´¥ê¥º¥à¤Ï¡¢ÌäÂê»ë¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
-"¤â¤Ã¤Èɸ½àŪ¤Ê¥¢¥ë¥´¥ê¥º¥à¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤!\n"
+#: 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 "¤¢¤Ê¤¿¤Î¥Õ¥©¥È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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 msgstr ""
 "¼º¸ú¾ÚÌÀ½ñ¤òºîÀ®¤·¤Þ¤·¤¿¡£\n"
 "\n"
-"¸«¤Ä¤«¤é¤Ê¤¤¤è¤¦¤ÊÇÞÂΤ˰ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤·¥ï¥ë¤¬¤³¤Î¾ÚÌÀ½ñ¤Ø¤Î¥¢\n"
-"¥¯¥»¥¹¤òÆÀ¤ë¤È¡¢¤½¤¤¤Ä¤¬¤¢¤Ê¤¿¤Î¾ÚÌÀ½ñ¤ò»È¤¨¤Ê¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
+"¸«¤Ä¤«¤é¤Ê¤¤¤è¤¦¤ÊÇÞÂΤ˰ÜÆ°¤·¤Æ¤¯¤À¤µ¤¤¡£¤â¤·¥ï¥ë¤¬¤³¤Î¾ÚÌÀ½ñ¤Ø¤Î\n"
+"¥¢¥¯¥»¥¹¤òÆÀ¤ë¤È¡¢¤½¤¤¤Ä¤Ï¤¢¤Ê¤¿¤Î¸°¤ò»È¤¨¤Ê¤¯¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£\n"
 "ÇÞÂΤ¬ÆɽФ·ÉÔǽ¤Ë¤Ê¤Ã¤¿¾ì¹ç¤ËÈ÷¤¨¤Æ¡¢¤³¤Î¾ÚÌÀ½ñ¤ò°õºþ¤·¤ÆÊݴɤ¹¤ë¤Î\n"
-"¤¬¸­ÌÀ¤Ç¤¹¡£¤·¤«¤·¡¢Ãí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Î°õ»ú¥·¥¹¥Æ¥à¤Ï¡¢\n"
+"¤¬¸­ÌÀ¤Ç¤¹¡£¤·¤«¤·¡¢¤´Ãí°Õ¤¯¤À¤µ¤¤¡£¤¢¤Ê¤¿¤Î¥Þ¥·¥ó¤Î°õ»ú¥·¥¹¥Æ¥à¤Ï¡¢\n"
 "¤À¤ì¤Ç¤â¸«¤¨¤ë¾ì½ê¤Ë¥Ç¡¼¥¿¤ò¤ª¤¯¤³¤È¤¬¤¢¤ê¤Þ¤¹!\n"
 
 #: g10/revoke.c:592
@@ -5134,7 +5063,7 @@
 #: 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 @@
 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 @@
 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 @@
 #: 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 @@
 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 @@
 "# 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 @@
 #: 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 @@
 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 @@
 
 #: g10/tdbio.c:597
 msgid "NOTE: trustdb not writable\n"
-msgstr "·Ù¹ð: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¡¢½ñ¹þ¤ßÉÔǽ¤Ç¤¹\n"
+msgstr "Ãí°Õ: ¿®Íѥǡ¼¥¿¥Ù¡¼¥¹¤¬¡¢½ñ¹þ¤ßÉÔǽ¤Ç¤¹\n"
 
 #: g10/tdbio.c:614
 #, c-format
@@ -5493,7 +5410,7 @@
 #: 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 
 #: util/errors.c:55
 msgid "unknown packet type"
-msgstr "̤ÃΤΥѥ±¥Ã¥È¡¦¥¿¥¤¥×¤Ç¤¹"
+msgstr "̤ÃΤΥѥ±¥Ã¥È·¿¤Ç¤¹"
 
 #: util/errors.c:56
 msgid "unknown version"
@@ -5758,7 +5713,7 @@
 
 #: util/errors.c:71
 msgid "wrong secret key used"
-msgstr "¸í¤Ã¤¿ÈëÌ©¸°¤¬ÍѤ¤¤é¤ì¤Æ¤¤¤Þ¤¹"
+msgstr "¸í¤Ã¤¿ÈëÌ©¸°¤¬»È¤ï¤ì¤Æ¤¤¤Þ¤¹"
 
 #: util/errors.c:72
 msgid "not supported"
@@ -5782,7 +5737,7 @@
 
 #: util/errors.c:77
 msgid "file open error"
-msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¥ª¡¼¥×¥ó¡¦¥¨¥é¡¼"
 
 #: util/errors.c:78
 msgid "file create error"
@@ -5818,11 +5773,11 @@
 
 #: 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 @@
 
 #: util/errors.c:89
 msgid "file close error"
-msgstr "¥Õ¥¡¥¤¥ë¤¬ÊĤ¸¤é¤ì¤Þ¤»¤ó"
+msgstr "¥Õ¥¡¥¤¥ë¤Î¥¯¥í¡¼¥º¡¦¥¨¥é¡¼"
 
 #: util/errors.c:90
 msgid "file rename error"
@@ -5854,7 +5809,7 @@
 
 #: util/errors.c:95
 msgid "file exists"
-msgstr "¥Õ¥¡¥¤¥ë¤¬´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹"
+msgstr "¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤·¤Æ¤¤¤Þ¤¹"
 
 #: util/errors.c:96
 msgid "weak key"
@@ -5897,22 +5852,20 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: 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"
+msgstr "(¤³¤ÎÌÜŪ¤Ë¤Ï¸í¤Ã¤¿¥×¥í¥°¥é¥à¤ò»È¤Ã¤¿¤Î¤Ç¤·¤ç¤¦)\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"
-
-#~ 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: ¤³¤Î¸°¤Ï¿®ÍѤǤ­¤Þ ¤»¤ó\n"
-
-#~ msgid "   (%d) RSA (sign and encrypt)\n"
-#~ msgstr "   (%d) RSA (½ð̾¤È°Å¹æ²½)\n"
-
-#, fuzzy
-#~ msgid "   (%d) RSA (auth only)\n"
-#~ msgstr "   (%d) RSA (½ð̾¤Î¤ß)\n"
+#~ msgid "digest algorithm `%s' is read-only in this release\n"
+#~ msgstr "Í×Ì󥢥르¥ê¥º¥à¡Ö%s¡×¤Ï¡¢¤³¤ÎÈǤÀ¤ÈÆɽФ·¤À¤±¤Ç¤¹\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"
+#~ msgid "[%8.8s] "
+#~ msgstr "[%8.8s] "
 
-#, 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"
+#~ "¿·¤·¤¤%s¸°ÂФòÀ¸À®¤·¤Þ¤¹¡£\n"
+#~ "        ºÇû¤Î¸°Ä¹¤Ï  768 ¥Ó¥Ã¥È\n"
+#~ "        ´ûÄê¤Î¸°Ä¹¤Ï 1024 ¥Ó¥Ã¥È\n"
+#~ "    ºÇĹ¤Î¿ä¾©¸°Ä¹¤Ï 2048 ¥Ó¥Ã¥È\n"
+
+#~ msgid "DSA only allows keysizes from 512 to 1024\n"
+#~ msgstr "DSA¤Î¸°Ä¹¤Ï512¤«¤é1024¤Þ¤Ç¤Ç¤¹\n"
 
-#~ msgid "%s: can't create directory: %s\n"
-#~ msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¡¼¤¬¤Ç¤­¤Þ¤»¤ó: %s\n"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£RSA¤ÏºÇ¾®¤Ç¤â1024¤Ç¤¹¡£\n"
 
-#~ msgid "If you want to use this revoked key anyway, answer \"yes\"."
-#~ msgstr "¤³¤Î¼º¸ú¤µ¤ì¤¿¸°¤ò»È¤¤¤¿¤¯¤Ê¤±¤ì¤Ð¡¢¡Öno¡×¤ÈÅú¤¨¤Æ¤¯¤À¤µ¤¤¡£"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "¸°Ä¹¤¬¾®¤µ¤¹¤®¤Þ¤¹¡£ºÇ¾®¤Ç¤â768¤Ç¤¹¡£\n"
 
-#~ 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 " (¼ç¸°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"
+#~ "Keysizes larger than 2048 are not suggested because\n"
+#~ "computations take REALLY long!\n"
 #~ msgstr ""
-#~ "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎ\n"
-#~ "ÊñÁõ½üµî"
-
-#~ msgid "En-Armor a file or stdin"
-#~ msgstr "¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ïɸ½àÆþÎϤÎÊñÁõ²½"
-
-#~ msgid "|NAME|use NAME as default recipient"
-#~ msgstr ""
-#~ "|̾Á°|´ûÄê¤Î¼õ¼è¿Í¤È¤·¤Æ\n"
-#~ "¡Ö̾Á°¡×¤ò»ÈÍÑ"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "´ûÄê¤Î¼õ¼è¿Í¤Ë´ûÄê¤Î¸°¤ò»ÈÍÑ"
+#~ "2048¤è¤êÂ礭¤Ê¸°Ä¹¤Ï¡¢·×»»»þ´Ö¤¬ Èó¾ï¤Ë Ť¯¤Ê¤ë¤Î¤Ç\n"
+#~ "¿ä¾©¤·¤Þ¤»¤ó!\n"
 
-#~ 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 "¸°ÎؤΰìÍ÷¤Ë¤³¤Î¸°ÎؤòÄɲÃ"
-
-#~ 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 "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "¤³¤Î¸°Ä¹¤ÇËÜÅö¤Ë¤è¤¤¤Ç¤¹¤«? (y/N) "
 
 #~ msgid ""
-#~ "%08lX: It is not sure that this key really belongs to the owner\n"
-#~ "but it is accepted anyway\n"
+#~ "Okay, but keep in mind that your monitor and keyboard radiation is also "
+#~ "very vulnerable to attacks!\n"
 #~ msgstr ""
-#~ "%08lX: ¤³¤Î¸°¤Ï¼ÂºÝ¤ËËܿͤΤâ¤Î¤«¤ÏÉÔÌÀ¤Ç¤¹¤¬¡¢\n"
-#~ "¤¤¤Á¤ª¤¦¼õÍý¤·¤Þ¤¹\n"
+#~ "¤ï¤«¤ê¤Þ¤·¤¿¡£¤·¤«¤·¡¢¤¢¤Ê¤¿¤Î¥â¥Ë¥¿¡¼¤ä¥­¡¼¥Ü¡¼¥Éíռͤϡ¢\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 "Experimental algorithms should not be used!\n"
+#~ msgstr "¼Â¸³Ãæ¤Î¥¢¥ë¥´¥ê¥º¥à¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó!\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"
-#~ "½ð̾¤ËÍѤ¤¤ë¤Ë¤Ï¡¢¤³¤Î¸°¤Ï°ÂÁ´¤Ç¤Ï ¤Ê¤¤ ¤Ç¤¹!\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"
-
-#~ 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"
Index: gnupg/po/nl.po
diff -u gnupg/po/nl.po:1.17 gnupg/po/nl.po:1.18
--- gnupg/po/nl.po:1.17	Thu Oct 28 11:06:49 2004
+++ gnupg/po/nl.po	Fri Dec 10 23:20:44 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <cyriatan at fastmail.fm>\n"
 "Language-Team: Dutch <vertaling at nl.linux.org>\n"
@@ -38,8 +38,8 @@
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 "         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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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"
 
Index: gnupg/po/pl.po
diff -u gnupg/po/pl.po:1.47 gnupg/po/pl.po:1.48
--- gnupg/po/pl.po:1.47	Thu Oct 28 11:06:49 2004
+++ gnupg/po/pl.po	Fri Dec 10 23:20:43 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <alex at bofh.net.pl>\n"
 "Language-Team: Polish <pl at li.org>\n"
@@ -24,11 +24,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "B³êdy prosimy zg³aszaæ na adres <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "             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 @@
 "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 @@
 "             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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Tadeusz ¯eleñski (Boy) <tzb at ziemianska.pl>\"\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 @@
 "    \"%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 @@
 "\"--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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/pt.po
diff -u gnupg/po/pt.po:1.12 gnupg/po/pt.po:1.13
--- gnupg/po/pt.po:1.12	Thu Oct 28 11:06:49 2004
+++ gnupg/po/pt.po	Fri Dec 10 23:20:43 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <morais at kde.org>\n"
 "Language-Team: pt <morais at kde.org>\n"
@@ -17,11 +17,6 @@
 "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 @@
 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 @@
 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 @@
 "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: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: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 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 "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]"
 
Index: gnupg/po/pt_BR.po
diff -u gnupg/po/pt_BR.po:1.49 gnupg/po/pt_BR.po:1.50
--- gnupg/po/pt_BR.po:1.49	Thu Oct 28 11:06:49 2004
+++ gnupg/po/pt_BR.po	Fri Dec 10 23:20:43 2004
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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: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 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 "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"
 
Index: gnupg/po/ro.po
diff -u gnupg/po/ro.po:1.7 gnupg/po/ro.po:1.8
--- gnupg/po/ro.po:1.7	Thu Oct 28 11:06:49 2004
+++ gnupg/po/ro.po	Fri Dec 10 23:20:42 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <lbgnupg at rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro at lists.sourceforge.net>\n"
@@ -18,11 +18,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Raportaþi bug-uri la <gnupg-bugs at gnu.org>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "              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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Popa Ioan (popicã) <popa.ioan at compania.ro>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "î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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/ru.po
diff -u gnupg/po/ru.po:1.50 gnupg/po/ru.po:1.51
--- gnupg/po/ru.po:1.50	Thu Oct 28 11:06:49 2004
+++ gnupg/po/ru.po	Fri Dec 10 23:20:42 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <maxbritov at tut.by>\n"
 "Language-Team: Russian <gnupg-ru at gnupg.org>\n"
@@ -15,11 +15,6 @@
 "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 @@
 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 @@
 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 @@
 "Недостаточно случайных чисел.  Выполняйте какие-либо действия для того,\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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/g10.c:540
+#: g10/g10.c:536
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1121,18 +1208,18 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "О найденных ошибка сообщайте <gnupg-bugs at gnu.org>.\n"
 "Подпишитесь на русскоязычную группу рассылки GnuPG-ru отправив письмо по "
 "адресу gnupg-ru-request at gnupg.org с темой 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 @@
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/g10.c:757
+#: g10/g10.c:747
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1150,463 +1237,463 @@
 "\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 @@
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "Введите новый пароль для данного секретного ключа.\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 @@
 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 @@
 "Заметьте, что показанные степени достоверности могут быть неверными,\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 @@
 "ВНИМАНИЕ: нет 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 @@
 "ВНИМАНИЕ: Это ключ 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 @@
 "ВНИМАНИЕ: Это ключ 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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "Ваша система не может корректно отображать даты после 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 @@
 "    \"Baba Yaga (pensioner) <yaga at deepforest.ru>\"\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 @@
 "    \"%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 @@
 "Для защиты секретного ключа необходим пароль.\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 @@
 "запустив данную программу с ключом \"--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 @@
 "обращения к дискам) в процессе генерации; это даст генератору\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 @@
 "можете\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 @@
 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 @@
 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 @@
 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:314
+#, fuzzy, 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"
-msgstr ""
-"не рекомендуем данный алгоритм шифрования; используйте более стандартный!\n"
+#: 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 @@
 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 @@
 "\"%.*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 @@
 "Необходим пароль для доступа к секретному ключу пользователя:\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "(возможно, Вы используете неподходящее программное обеспечение\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 @@
 #~ msgid "rev? problem checking revocation: %s\n"
 #~ msgstr "rev? проблема проверки отзыва: %s\n"
 
-#~ msgid "[revoked] "
-#~ msgstr "[отозван]"
-
-#~ msgid "[expired] "
-#~ msgstr "[просрочен]"
-
 #, fuzzy
 #~ msgid " [expired: %s]"
 #~ msgstr " [годен до: %s]"
Index: gnupg/po/sk.po
diff -u gnupg/po/sk.po:1.7 gnupg/po/sk.po:1.8
--- gnupg/po/sk.po:1.7	Thu Oct 28 11:06:49 2004
+++ gnupg/po/sk.po	Fri Dec 10 23:20:42 2004
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <mmajer at econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -13,11 +13,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "(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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Chyby oznámte, prosím, na adresu <gnupg-bugs at gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n at lists.linux.sk>.\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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "    \"Jozko Mrkvicka (student) <jozko at mrkvicka.sk>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "\"%.*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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/sv.po
diff -u gnupg/po/sv.po:1.17 gnupg/po/sv.po:1.18
--- gnupg/po/sv.po:1.17	Thu Oct 28 11:06:49 2004
+++ gnupg/po/sv.po	Fri Dec 10 23:20:41 2004
@@ -10,54 +10,47 @@
 # 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 <daniel at resare.com>, 1999-2002,
 # who sends his thanks to André Dahlqvist <andre at beta.telenordia.se>
 # and to his wife Olivia <olivia at resare.com>. 
 #
-# $Id: sv.po,v 1.17 2004/10/28 09:06:49 wk Exp $
+# $Id: sv.po,v 1.18 2004/12/10 22:20:41 wk Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.1\n"
+"Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <pt at radvis.nu>\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 <info at clipanish.com>\n"
 "Language-Team: Swedish <sv at li.org>\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 @@
 
 #: 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 @@
 
 #: 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 @@
 "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: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
-#, 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 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 @@
 #, 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "@\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 @@
 "\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 <gnupg-bugs at gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs at gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <sv at li.org>.\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 @@
 "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 @@
 "\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"
+msgstr "den valda kontrollsummealgoritmen är felaktig\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
+# 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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 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 @@
 "      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 @@
 "     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 @@
 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 @@
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1268
 msgid "delphoto"
-msgstr "ta bort bild"
+msgstr "delphoto"
 
 #: g10/keyedit.c:1269
 msgid "addkey"
@@ -2999,7 +3091,7 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1278
 msgid "primary"
-msgstr "huvud"
+msgstr "primary"
 
 #: g10/keyedit.c:1278
 msgid "flag user ID as primary"
@@ -3035,7 +3127,7 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 "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 @@
 "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 @@
 "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 @@
 "Ä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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 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) <gustav at trekronor.se>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 
 #: 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #: 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 
 #: 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 @@
 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 @@
 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 @@
 #, 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 @@
 
 #: 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 @@
 
 #: 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 @@
 
 #: 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 @@
 #: 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 @@
 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 @@
 "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 @@
 
 #: 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 @@
 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 @@
 #, 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 @@
 #: 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 @@
 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"
-
-#: g10/sign.c:783 g10/sign.c:1040
-#, fuzzy, c-format
-msgid "writing to file `%s'\n"
-msgstr "skriver till \"%s\"\n"
+"när du är i --pgp2-läge\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 @@
 "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 @@
 #: 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 @@
 #: 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 @@
 #: 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 @@
 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 @@
 #: 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 @@
 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 @@
 
 #: 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 @@
 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 "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 "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 "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 "|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 @@
 
 #~ 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 "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 "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 @@
 #~ 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 "%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 "%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 @@
 #~ 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 "  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 "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 "%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 @@
 #~ 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 @@
 #~ 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"
Index: gnupg/po/tr.po
diff -u gnupg/po/tr.po:1.13 gnupg/po/tr.po:1.14
--- gnupg/po/tr.po:1.13	Thu Oct 28 11:06:49 2004
+++ gnupg/po/tr.po	Fri Dec 10 23:20:41 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <nilgun at superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
@@ -16,11 +16,6 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "Yazılım hatalarını lütfen <gnupg-bugs at gnu.org> 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 @@
 "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 @@
 "\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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 "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 @@
 "       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 @@
 "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 @@
 "       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 @@
 "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 @@
 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 @@
 
 #: 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 @@
 "      <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 @@
 "      <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 @@
 "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 @@
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah at ottoman.gov>\"\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 @@
 "    \"%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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"
Index: gnupg/po/zh_CN.po
diff -u gnupg/po/zh_CN.po:1.7 gnupg/po/zh_CN.po:1.8
--- gnupg/po/zh_CN.po:1.7	Thu Oct 28 11:06:49 2004
+++ gnupg/po/zh_CN.po	Fri Dec 10 23:20:41 2004
@@ -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 <zuxyhere at eastday.com>, 2004.
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.2.2\n"
+"Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <zuxyhere at eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation at lists.linux.net.cn>\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"
+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"
-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 @@
 "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 @@
 "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 @@
 "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:1021
+#, fuzzy
+msgid "|N|New PIN"
+msgstr "æ–°çš„ PIN"
 
-#: g10/app-openpgp.c:1301
+#: 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:1113
+msgid "generating new key\n"
+msgstr "生成新密钥\n"
 
-#: g10/app-openpgp.c:1812
+#: 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/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/cardglue.c:704
+msgid "Repeat this PIN: "
+msgstr "再次输入此 PIN:"
+
+#: 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 "±à¼­Ä³°ÑÃÜÔ¿»òΪÆäÌí¼ÓÇ©×Ö"
+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 "°ÑÃÜÔ¿µ¼³öµ½Ä³¸ö¹«Ô¿·þÎñÆ÷ÉÏ"
+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 @@
 " "
 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¼×|ΪÊÕ¼þÕß¡°Ä³¼×¡±¼ÓÃÜ"
+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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
-msgstr "ÇëÏò <gnupg-bugs at gnu.org> ±¨¸æ³ÌÐòȱÏÝ¡£\n"
+msgstr ""
+"请向 <gnupg-bugs at gnu.org> 报告程序缺陷。\n"
+"请向 <zuxyhere at eastday.com> 反映简体中文翻译的问题。\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 @@
 "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 @@
 "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 @@
 "\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 @@
 "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 "ÇëÊäÈëÃÜÔ¿µÄ³ß´ç"
+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 @@
 "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 @@
 "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 @@
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"µ±ÄúΪij°ÑÃÜÔ¿ÉÏij¸öÓû§±êʶÌí¼ÓÇ©×Öʱ£¬Äú±ØÐëÊ×ÏÈÑéÖ¤Õâ°Ñ\n"
-"ÃÜԿȷʵÊôÓÚÊðÃûÓÚËüµÄÓû§±êʶÉϵÄÄǸöÈË¡£Á˽⵽ÄúÔø¶àô½÷\n"
-"É÷µØ¶Ô´Ë½øÐйýÑéÖ¤£¬¶ÔÆäËûÈËÊǷdz£ÓÐÓõÄ\n"
-"\n"
-"¡°0¡± ±íʾÄú²»ÄÜÌá³öÈκÎÌض¨µÄÉùÃ÷À´±íÃ÷\n"
-"    Äú¶à×ÐϸÑéÖ¤ÄÇ°ÑÃÜÔ¿\n"
-"\n"
-"¡°1¡± ±íʾÄúÏàÐÅÕâ°ÑÃÜÔ¿ÊôÓÚÄǸöÉùÃ÷ÊÇÖ÷È˵ÄÈË£¬\n"
-"    µ«ÊÇÄú²»ÄÜ»ò¸ù±¾Ã»ÓÐÑéÖ¤¹ý¡£\n"
-"    Õâ¶ÔÄÇЩֻÏëÒª¡°¸öÈË¡±ÑéÖ¤µÄÈËÀ´ËµºÜÓÐÓã¬\n"
-"    ÒòΪÄúΪһ°ÑÀàËÆÄäÃûʹÓÃÕßµÄÃÜÔ¿Ç©ÁË×Ö¡£\n"
-"\n"
-"¡°2¡± ±íʾÄúËæÒâµØÑéÖ¤ÁËÄÇ°ÑÃÜÔ¿¡£\n"
-"    ÀýÈ磬ÄúÑéÖ¤ÁËÕâ°ÑÃÜÔ¿µÄÖ¸ÎÆ£¬\n"
-"    »ò±È¶ÔÕÕƬÑéÖ¤ÁËÓû§±êʶ¡£\n"
-"\n"
-"¡°3¡± ±íʾÄú×öÁË´óÁ¿Ï꾡µÄÑéÖ¤ÃÜÔ¿¹¤×÷¡£\n"
-"    ÀýÈç˵£¬ÄúͬÃÜÔ¿³ÖÓÐÈËÑéÖ¤ÁËÃÜÔ¿Ö¸ÎÆ£¬\n"
-"    ¶øÇÒͨ¹ý²éÑ鸽´øÕÕƬ¶øÄÑÒÔαÔìµÄÖ¤¼þ(È绤ÕÕ)\n"
-"    È·ÈÏÁËÃÜÔ¿³ÖÓÐÈ˵ÄÐÕÃûÓëÃÜÔ¿ÉϵÄÓû§±êʶһÖ£¬\n"
-"    ×îºóÄú»¹(ͨ¹ýµç×ÓÓʼþÍùÀ´)ÑéÖ¤ÁËÃÜÔ¿ÉϵÄ\n"
-"    µç×ÓÓʼþµØַȷʵÊôÓÚÃÜÔ¿³ÖÓÐÈË¡£\n"
-"\n"
-"Çë×¢ÒâÉÏÊö¹ØÓڵȼ¶ 2 ºÍ 3 µÄ˵Ã÷½öÊÇÀý×Ó¶øÒÑ¡£\n"
-"×îÖÕ»¹ÊǵÃÓÉÄú×Ô¼º¾ö¶¨µ±ÄúΪÆäËûÃÜÔ¿Ç©×Öʱ£¬\n"
-"ʲôÊÇ¡°ËæÒ⡱£¬¶øʲôÊÇ¡°´óÁ¿¶øÏ꾡¡±¡£\n"
+"当您为某把密钥上某个用户标识添加签字时,您必须首先验证这把密钥确实属于\n"
+"署名于它的用户标识上的那个人。了解到您曾多么谨慎地对此进行过验证,对其\n"
+"他人是非常有用的\n"
+"\n"
+"“0” 表示您对您有多么仔细地验证这把密钥的问题不表态。\n"
+"\n"
+"“1” 表示您相信这把密钥属于那个声明是主人的人,但是您不能或根本没有验\n"
+"      证过。如果您为一把属于类似虚拟人物的密钥签字,这个选择很有用。\n"
 "\n"
-"Èç¹ûÄú²»ÖªµÀÓ¦¸Ãѡʲô´ð°¸µÄ»°£¬¾ÍÑ¡¡°0¡±¡£"
+"“2” 表示您随意地验证了那把密钥。例如,您验证了这把密钥的指纹,或比对\n"
+"      照片验证了用户标识。\n"
+"\n"
+"“3” 表示您做了大量而详尽的验证密钥工作。例如,您同密钥持有人验证了密\n"
+"      钥指纹,而且通过查验附带照片而难以伪造的证件(如护照)确认了密钥持\n"
+"      有人的姓名与密钥上的用户标识一致,最后您还(通过电子邮件往来)验证\n"
+"      了密钥上的电子邮件地址确实属于密钥持有人。\n"
+"\n"
+"请注意上述关于验证级别 2 和 3 的说明仅是例子而已。最终还是由您自己决定\n"
+"当您为其他密钥签字时,什么是“随意”,而什么是“大量而详尽”。\n"
+"\n"
+"如果您不知道应该选什么答案的话,就选“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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "      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"
-"      Èç¹ûÄúÏàÐÅÓÐ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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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 @@
 "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"
-"¾¯¸æ£ºÕâ·ÝÇ©×Ö²»»á±»±ê¼Ç³É²»¿ÉµõÏú¡£\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"
-"Îҷ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 @@
 
 #: g10/keyedit.c:1247
 msgid "save and quit"
-msgstr "±£´æ²¢À뿪"
+msgstr "保存并离开"
 
 #: g10/keyedit.c:1250
 msgid "fpr"
@@ -2730,11 +2739,11 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1253
 msgid "select user ID N"
-msgstr "Ñ¡ÔñÓû§±êʶN"
+msgstr "选择用户标识 N"
 
 #: g10/keyedit.c:1254
 msgid "key"
@@ -2750,7 +2759,7 @@
 
 #: g10/keyedit.c:1254
 msgid "select secondary key N"
-msgstr "Ñ¡Ôñ×ÓÔ¿ N"
+msgstr "选择子钥 N"
 
 #: g10/keyedit.c:1255
 msgid "check"
@@ -2758,7 +2767,7 @@
 
 #: g10/keyedit.c:1255
 msgid "list signatures"
-msgstr "ÁгöÇ©×Ö"
+msgstr "列出签字"
 
 #: g10/keyedit.c:1256
 msgid "c"
@@ -2770,21 +2779,19 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1260
 msgid "sign the key locally"
-msgstr "ΪÃÜÔ¿Ìí¼Ó±¾µØÇ©×Ö"
+msgstr "为密钥添加本地签字"
 
 #: g10/keyedit.c:1261
 msgid "nrsign"
@@ -2800,7 +2807,7 @@
 
 #: g10/keyedit.c:1261
 msgid "sign the key non-revocably"
-msgstr "ΪÃÜÔ¿Ìí¼Ó²»¿ÉµõÏúÇ©×Ö"
+msgstr "为密钥添加不可吊销签字"
 
 #: g10/keyedit.c:1262
 msgid "nrlsign"
@@ -2808,7 +2815,7 @@
 
 #: g10/keyedit.c:1262
 msgid "sign the key locally and non-revocably"
-msgstr "ΪÃÜÔ¿Ìí¼Ó²»¿ÉµõÏúµÄ±¾µØÇ©×Ö"
+msgstr "为密钥添加不可吊销的本地签字"
 
 #: g10/keyedit.c:1264
 msgid "adduid"
@@ -2816,7 +2823,7 @@
 
 #: g10/keyedit.c:1264
 msgid "add a user ID"
-msgstr "Ôö¼ÓÒ»¸öÓû§±êʶ"
+msgstr "增加一个用户标识"
 
 #: g10/keyedit.c:1265
 msgid "addphoto"
@@ -2824,7 +2831,7 @@
 
 #: g10/keyedit.c:1265
 msgid "add a photo ID"
-msgstr "Ôö¼ÓÒ»¸öÕÕƬ±êʶ"
+msgstr "增加一个照片标识"
 
 #: g10/keyedit.c:1266
 msgid "deluid"
@@ -2832,7 +2839,7 @@
 
 #: g10/keyedit.c:1266
 msgid "delete user ID"
-msgstr "ɾ³ýÒ»¸öÓû§/ÕÕƬ±êʶ"
+msgstr "删除一个用户/照片标识"
 
 #: g10/keyedit.c:1268
 msgid "delphoto"
@@ -2844,24 +2851,23 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1274
 msgid "delete a secondary key"
-msgstr "ɾ³ýÒ»°Ñ×ÓÔ¿"
+msgstr "删除一把子钥"
 
 #: g10/keyedit.c:1275
 msgid "addrevoker"
@@ -2877,7 +2883,7 @@
 
 #: g10/keyedit.c:1275
 msgid "add a revocation key"
-msgstr "Ôö¼ÓÒ»°ÑµõÏúÃÜÔ¿"
+msgstr "增加一把吊销密钥"
 
 #: g10/keyedit.c:1276
 msgid "delsig"
@@ -2885,7 +2891,7 @@
 
 #: g10/keyedit.c:1276
 msgid "delete signatures"
-msgstr "ɾ³ýÇ©×Ö"
+msgstr "删除签字"
 
 #: g10/keyedit.c:1277
 msgid "expire"
@@ -2893,7 +2899,7 @@
 
 #: g10/keyedit.c:1277
 msgid "change the expire date"
-msgstr "¸ü¸ÄʹÓÃÆÚÏÞ"
+msgstr "更改使用期限"
 
 #: g10/keyedit.c:1278
 msgid "primary"
@@ -2901,7 +2907,7 @@
 
 #: g10/keyedit.c:1278
 msgid "flag user ID as primary"
-msgstr "É趨Ê×Ñ¡Óû§±êʶ"
+msgstr "设定首选用户标识"
 
 #: g10/keyedit.c:1279
 msgid "toggle"
@@ -2909,7 +2915,7 @@
 
 #: g10/keyedit.c:1279
 msgid "toggle between secret and public key listing"
-msgstr "ÔÚ˽ԿºÍ¹«Ô¿Çåµ¥¼äÇл»"
+msgstr "在私钥和公钥清单间切换"
 
 #: g10/keyedit.c:1281
 msgid "t"
@@ -2921,7 +2927,7 @@
 
 #: g10/keyedit.c:1282
 msgid "list preferences (expert)"
-msgstr "ÁгöÊ×Ñ¡Ïî(ר¼Òģʽ)"
+msgstr "列出首选项(专家模式)"
 
 #: g10/keyedit.c:1283
 msgid "showpref"
@@ -2929,7 +2935,7 @@
 
 #: g10/keyedit.c:1283
 msgid "list preferences (verbose)"
-msgstr "ÁгöÊ×Ñ¡Ïî(Ïêϸģʽ)"
+msgstr "列出首选项(详细模式)"
 
 #: g10/keyedit.c:1284
 msgid "setpref"
@@ -2937,7 +2943,7 @@
 
 #: g10/keyedit.c:1284
 msgid "set preference list"
-msgstr "É趨Ê×Ñ¡Ïî"
+msgstr "设定首选项"
 
 #: g10/keyedit.c:1285
 msgid "updpref"
@@ -2945,21 +2951,19 @@
 
 #: 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 @@
 
 #: g10/keyedit.c:1288
 msgid "change the ownertrust"
-msgstr "¸ü¸ÄÐÅÈζÈ"
+msgstr "更改信任度"
 
 #: g10/keyedit.c:1289
 msgid "revsig"
@@ -2975,7 +2979,7 @@
 
 #: g10/keyedit.c:1289
 msgid "revoke signatures"
-msgstr "µõÏúÇ©×Ö"
+msgstr "吊销签字"
 
 #: g10/keyedit.c:1290
 msgid "revuid"
@@ -2983,7 +2987,7 @@
 
 #: g10/keyedit.c:1290
 msgid "revoke a user ID"
-msgstr "µõÏúÒ»¸öÓû§±êʶ"
+msgstr "吊销一个用户标识"
 
 #: g10/keyedit.c:1291
 msgid "revkey"
@@ -2991,7 +2995,7 @@
 
 #: g10/keyedit.c:1291
 msgid "revoke a secondary key"
-msgstr "µõÏúÒ»°Ñ×ÓÔ¿"
+msgstr "吊销一把子钥"
 
 #: g10/keyedit.c:1292
 msgid "disable"
@@ -2999,7 +3003,7 @@
 
 #: g10/keyedit.c:1292
 msgid "disable a key"
-msgstr "½ûÓÃÒ»°ÑÃÜÔ¿"
+msgstr "禁用一把密钥"
 
 #: g10/keyedit.c:1293
 msgid "enable"
@@ -3007,7 +3011,7 @@
 
 #: g10/keyedit.c:1293
 msgid "enable a key"
-msgstr "ÆôÓÃÒ»°ÑÃÜÔ¿"
+msgstr "启用一把密钥"
 
 #: g10/keyedit.c:1294
 msgid "showphoto"
@@ -3015,667 +3019,604 @@
 
 #: 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 ""
+msgstr "卡号:"
 
-#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
-#, c-format
-msgid "[%8.8s] "
-msgstr ""
+#: g10/keyedit.c:2397
+msgid "There are no preferences on a PGP 2.x-style user ID.\n"
+msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: 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
-msgid "There are no preferences on a PGP 2.x-style user ID.\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: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 ""
-"¾¯¸æ£ºÃ»ÓÐÒ»¸öÓû§±êʶ±»±ê¼ÇΪÊ×Ñ¡Óû§±êʶ¡£´ËÃüÁî¿ÉÄܼٶ¨Ò»¸ö²»Í¬\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 "Äú²»Äܽ«Ä³°ÑÃÜÔ¿ÉèΪËü×Ô¼ºµÄÖ¸¶¨µõÏúÕß\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Ù×÷ÎÞ·¨³·Ïú£¡\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 @@
 "      <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"
+"请设定这把密钥的有效期限。\n"
+"         0 = 密钥永不过期\n"
+"      <n>  = 密钥在 n 天后过期\n"
+"      <n>w = 密钥在 n 周后过期\n"
+"      <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"
@@ -3700,50 +3641,48 @@
 "      <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"
+"请设定这份签字的有效期限。\n"
+"         0 = 签字永不过期\n"
+"      <n>  = 签字在 n 天后过期\n"
+"      <n>w = 签字在 n 周后过期\n"
+"      <n>m = 签字在 n 月后过期\n"
+"      <n>y = 签字在 n 年后过期\n"
 
-#: g10/keygen.c:1547
+#: 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 @@
 "\n"
 msgstr ""
 "\n"
-"ÄúÐèÒªÒ»¸öÓû§±êʶÀ´±æʶÄúµÄÃÜÔ¿£»±¾Èí¼þ»áÓÃÕæʵÐÕÃû¡¢\n"
-"×¢Êͺ͵ç×ÓÓʼþµØÖ·×éºÏ³ÉÓû§±êʶ£¬ÈçÏÂËùʾ£º\n"
-"    ¡°Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>¡±\n"
+"您需要一个用户标识来辨识您的密钥;本软件会用真实姓名、注释和电子邮件地址组"
+"合\n"
+"成用户标识,如下所示:\n"
+"    “Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>”\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"
-
-#: g10/keygen.c:2490
-msgid "DSA keypair will have 1024 bits.\n"
-msgstr "DSA ÃÜÔ¿¶Ô»áÓÐ 1024 ×Ö½Ú¡£\n"
+"我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\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"
+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:329
+#, fuzzy, c-format
+msgid "WARNING: using experimental digest algorithm %s\n"
+msgstr "%s签字,散列算法 %s\n"
 
-#: g10/misc.c:294
-msgid "Experimental algorithms should not be used!\n"
-msgstr "²»Ó¦Ê¹ÓÃʵÑéÐÔµÄËã·¨£¡\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 @@
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 "\n"
-"ÇëÌôÑ¡Ò»ÕÅͼƬ×÷ΪÄúµÄÕÕƬ±êʶ ¡£ÕâÕÅͼƬһ¶¨ÒªÊÇJPEGÎļþ¡£\n"
-"Çë¼ÇסÕâÕÅͼƬ»á±»´æ·ÅÔÚÄúµÄ¹«Ô¿Àï¡£Èç¹ûÄúÌôÁ˷dz£´óµÄͼƬµÄ»°£¬\n"
-"ÄúµÄÃÜÔ¿Ò²»á±ä³É·Ç³£´ó£¡\n"
-"Ç뾡Á¿°ÑͼƬ³ß´ç¿ØÖÆÔÚ240x288×óÓÒ£¬ÕâÊǸöÀíÏëµÄ³ß´ç¡£\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 @@
 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 @@
 "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£ºÃ»ÓÐÖ¤¾Ý±íÃ÷Õâ°ÑÃÜÔ¿ÕæµÄÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\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"
+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 "¾¯¸æ£ºÕâ°ÑÃÜÔ¿ÒѾ­±»ËüµÄ³ÖÓÐÕßµõÏúÁË£¡\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 "¾¯¸æ£ºÕâ°Ñ×ÓÔ¿ÒѾ­±»ËüµÄ³ÖÓÐÈ˵õÏúÁË£¡\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 "      ûÓÐÖ¤¾Ý±íÃ÷Õâ¸öÇ©×ÖÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß¡£\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 "      Õâ·ÝÇ©×Ö²¢²»Ò»¶¨ÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\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 @@
 "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 @@
 "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 @@
 "# 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¡¯²»ÊÇÒ»¸öÓÐЧµÄ³¤Ê½Ô¿³×ºÅ\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 "ÃÜÔ¿Òѱ»±ê¼Ç³É¾ø¶ÔÐÅÈΡ£\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: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"
+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 @@
 "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 "ÎÞЧµÄ²ÎÊý"
+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 @@
 
 #: 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 "(Äú¿ÉÄÜʹÓÃÁË´íÎóµÄ³ÌÐòÀ´Íê³É´ËÏîÈÎÎñ)\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 "ÐÞ¸´Ä³¸öÒÑË𻵵ÄÐÅÈζÈÊý¾Ý¿â"
-
-#~ 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¼×|½«¡°Ä³¼×¡±Ñ¡ÎªÄ¬ÈϵÄÊÕ¼þÕß"
-
-#~ msgid "use the default key as default recipient"
-#~ msgstr "°ÑĬÈϵÄÃÜÔ¿µ±×÷ĬÈϵÄÊÕ¼þÕß"
-
-#~ msgid "don't use the terminal at all"
-#~ 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 "force v3 signatures"
-#~ msgstr "Ç¿ÐÐʹÓà v3 Ç©×Ö"
+#~ msgid "keysize too small; 1024 is smallest value allowed for RSA.\n"
+#~ msgstr "密钥尺寸太小:RSA 密钥尺寸至少要有 1024。\n"
 
-#~ msgid "do not force v3 signatures"
-#~ msgstr "²»ÒªÇ¿ÐÐʹÓà v3 Ç©×Ö"
+#~ msgid "keysize too small; 768 is smallest value allowed.\n"
+#~ msgstr "密钥尺寸太小;至少要有 768。\n"
 
-#~ msgid "force v4 key signatures"
-#~ msgstr "Ç¿ÐÐʹÓà v4 ÃÜÔ¿Ç©×Ö"
-
-#~ msgid "do not force v4 key signatures"
-#~ msgstr "²»ÒªÇ¿ÐÐʹÓà v4 ÃÜÔ¿Ç©×Ö"
-
-#~ 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¼×|½«¡°Ä³¼×¡±ÉèΪĬÈÏ˽Կ"
-
-#~ 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: ÎÞ·¨È·¶¨Õâ°ÑÃÜÔ¿ÊÇ·ñÕæµÄÊôÓÚËüËùÉù³ÆµÄ³ÖÓÐÕß\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 "±ê¼Ç£º"
+#~ "不建议使用尺寸大于 2048 的密钥,\n"
+#~ "因为计算真的会花去很多时间!\n"
 
-#~ 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 "Are you sure that you want this keysize? (y/N) "
+#~ msgstr "您确定要用这个密钥尺寸吗?(y/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 µÄ³ÌÐò¿ÉÄܲ»ÄÜ\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 ʹÓÃÕß»¥Í¨¡£Í¬Ê±Õâ¸öËã·¨·Ç³£»ºÂý£¬\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"
Index: gnupg/po/zh_TW.po
diff -u gnupg/po/zh_TW.po:1.7 gnupg/po/zh_TW.po:1.8
--- gnupg/po/zh_TW.po:1.7	Thu Oct 28 11:06:49 2004
+++ gnupg/po/zh_TW.po	Fri Dec 10 23:20:40 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n at gnupg.org\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 <Jedi at idej.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
@@ -17,11 +17,6 @@
 "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 @@
 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 @@
 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 @@
 "À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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 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 @@
 "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 @@
 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 @@
 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 @@
 "@\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 @@
 " --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 <gnupg-bugs at gnu.org>.\n"
 msgstr "½Ð¦V <gnupg-bugs at bnu.org> ¦^³øµ{¦¡·å²«¡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 @@
 "ñ¸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 @@
 "\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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 "¿é¤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 @@
 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 @@
 "½Ðª`·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 @@
 "ĵ§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 @@
 "ĵ§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 @@
 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 @@
 
 #: 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
+#: 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 ""
-"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"
+msgid "%s keys may be between %u and %u bits long.\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) "
+#: 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: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:1439
+#: g10/keygen.c:1460
 #, 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 keysizes must be in the range %u-%u\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: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: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 @@
 "      <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 @@
 "      <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 @@
 "©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 @@
 "    \"Heinrich Heine (Der Dichter) <heinrichh at duesseldorf.de>\"\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 @@
 "    \"%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 @@
 "©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 @@
 "¶È»Ý­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 @@
 "¡]¹³¬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 @@
 "½Ðª`·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 @@
 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 @@
 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 @@
 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: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: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: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 @@
 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 @@
 "\"%.*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 @@
 "©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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 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 @@
 #~ 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]"




More information about the Gnupg-commits mailing list