about to release 1.4.3rc1gnupg-1.4.3rc1

38 files changed, 20536 insertions, 18743 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a040ed9b..33dedea65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-14  Werner Koch  <[email protected]>
+
+	Released 1.4.3rc1.
+
 2006-02-09  Werner Koch  <[email protected]>
 
 	* configure.ac: Check for fcntl and ftruncate.
@@ -1870,7 +1874,7 @@ Fri Feb 13 19:43:41 1998  Werner Koch  ([email protected])
 
 
  Copyright 1998, 1999, 2000, 2001, 2002, 2003,
-	   2004 Free Software Foundation, Inc.
+	   2004, 2005, 2006 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/NEWS b/NEWS
index 039b010cd..ec53b710c 100644
--- a/NEWS
+++ b/NEWS
@@ -1842,7 +1842,7 @@ Noteworthy changes in version 0.2.3
 
 
 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-          2005 Free Software Foundation, Inc.
+          2005, 2006 Free Software Foundation, Inc.
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without
diff --git a/README b/README
index 279495fd4..e31cb2822 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@
 			    Version 1.4.3
 
 	 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-		 2005 Free Software Foundation, Inc.
+		 2005, 2006 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
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index 7fe30517f..e01163631 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-14  Werner Koch  <[email protected]>
+
+	* random.c (lock_seed_file): Build even when not used.
+
 2006-02-09  Werner Koch  <[email protected]>
 
 	* random.c (lock_seed_file): New.
diff --git a/cipher/random.c b/cipher/random.c
index 52e421995..3c25a2b22 100644
--- a/cipher/random.c
+++ b/cipher/random.c
@@ -380,10 +380,10 @@ set_random_seed_file( const char *name )
    reasonable time to succeed.  With FOR_WRITE set to true a Rite lock
    will be taken.  FNAME is used only for diagnostics. Returns 0 on
    success or -1 on error. */
-#if LOCK_SEED_FILE
 static int
 lock_seed_file (int fd, const char *fname, int for_write)
 {
+#if LOCK_SEED_FILE
   struct flock lck;
   struct timeval tv;
   int backoff=0;
@@ -413,9 +413,9 @@ lock_seed_file (int fd, const char *fname, int for_write)
       if (backoff < 10)
         backoff++ ;
     }
+#endif /*LOCK_SEED_FILE*/
   return 0;
 }
-#endif /*LOCK_SEED_FILE*/
 
 
 
diff --git a/configure.ac b/configure.ac
index 26791222d..cd28ab81c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl configure.ac script for GnuPG
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-dnl               2005 Free Software Foundation, Inc.
+dnl               2005, 2006 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GnuPG.
 dnl
@@ -26,7 +26,7 @@ min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.4.3-cvs, [email protected])
+AC_INIT(gnupg, 1.4.3rc1, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 3b59c45d0..50336b61d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -12405,7 +12405,7 @@ Thu Feb 12 22:24:42 1998  Werner Koch  (wk@frodo)
 
 
  Copyright 1998, 1999, 2000, 2001, 2002, 2003,
-	   2004, 2005 Free Software Foundation, Inc.
+	   2004, 2005, 2006 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/g10/ccid-driver.c b/g10/ccid-driver.c
index 519cb5f2d..1e87ae578 100644
--- a/g10/ccid-driver.c
+++ b/g10/ccid-driver.c
@@ -1327,7 +1327,7 @@ ccid_shutdown_reader (ccid_driver_t handle)
 int 
 ccid_close_reader (ccid_driver_t handle)
 {
-  if (!handle || !handle->idev)
+  if (!handle || (!handle->idev && handle->dev_fd == -1))
     return 0;
 
   do_close_reader (handle);
diff --git a/po/be.po b/po/be.po
index 9d0d8a79d..68f5941bd 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -25,70 +25,80 @@ msgstr ""
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "немагчыма адкрыць \"%s\"\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "запіс у stdout\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr ""
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -97,14 +107,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -139,18 +149,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -159,11 +169,11 @@ msgstr "збой падпісаньня: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -260,22 +270,27 @@ msgstr ""
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -285,71 +300,71 @@ msgstr ""
 msgid "armor: %s\n"
 msgstr ""
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "нечаканыя даньні"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -365,12 +380,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr ""
@@ -543,8 +558,8 @@ msgstr ""
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
@@ -567,7 +582,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr ""
 
@@ -576,7 +591,7 @@ msgstr ""
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
@@ -651,7 +666,7 @@ msgstr "несумяшчальныя загады\n"
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -695,7 +710,7 @@ msgstr "Паўтарыце пароль: "
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -705,14 +720,14 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
@@ -752,7 +767,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -771,7 +786,7 @@ msgstr "збой падпісаньня: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr ""
@@ -796,7 +811,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -808,7 +823,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -818,12 +833,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -893,80 +908,72 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:62
+#: g10/export.c:61
 msgid "export signatures that are marked as local-only"
 msgstr ""
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
+#: g10/export.c:65
+msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
-
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/export.c:330
+#: g10/export.c:69
+msgid "remove unusable parts from key during export"
+msgstr ""
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -974,128 +981,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1105,51 +1112,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1157,7 +1164,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1177,15 +1184,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1195,7 +1202,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1203,567 +1210,567 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -1771,26 +1778,31 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -2077,15 +2089,11 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
+msgid "remove unusable parts from key after import"
 msgstr ""
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2210,295 +2218,295 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -2522,51 +2530,51 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2574,244 +2582,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2819,175 +2827,179 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1445
-msgid "clean unusable parts from key"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
 #: g10/keyedit.c:1564
@@ -3128,357 +3140,357 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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:2992
+#: g10/keyedit.c:2960
 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:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3212
-#, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr ""
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "грамадскі ключ ня знойдзены"
+
+#: g10/keyedit.c:3290
 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:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3802,7 +3814,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -3948,30 +3960,30 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr ""
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4018,358 +4030,391 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "імпартаваць ключы з паслужніка ключоў"
+
+#: g10/keyserver.c:1123
+#, c-format
+msgid "searching for names from %s\n"
+msgstr ""
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "немагчыма адкрыць %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr ""
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr ""
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4517,34 +4562,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4555,27 +4600,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4585,17 +4630,17 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
@@ -4639,23 +4684,23 @@ msgstr ""
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4720,7 +4765,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr ""
 
@@ -4789,97 +4834,105 @@ msgstr ""
 msgid "Note: This key has been disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr ""
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr ""
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr ""
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr ""
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr ""
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr ""
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr ""
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr ""
 
@@ -4918,35 +4971,35 @@ msgstr ""
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -4956,65 +5009,65 @@ msgstr "збой падпісаньня: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5025,34 +5078,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr ""
 
@@ -5200,25 +5253,25 @@ msgstr ""
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -5473,124 +5526,128 @@ msgstr ""
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "памылка чытаньня файла"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "невядомая вэрсыя"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5824,6 +5881,11 @@ msgstr "скасавана карыстальнікам\n"
 msgid "no card"
 msgstr ""
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "зашыфраваць даньні"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -5883,20 +5945,20 @@ msgstr ""
 msgid "cC"
 msgstr ""
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "УВАГА! Выкарыстоўваецца небясьпечная памяць!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "дзеяньне немагчымае без распачатае бясьпечнае памяці\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
@@ -5921,10 +5983,6 @@ msgstr ""
 #~ msgstr "паказаць сьпіс ключоў і подпісаў"
 
 #, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "грамадскі ключ ня знойдзены"
-
-#, fuzzy
 #~ msgid "error getting serial number: %s\n"
 #~ msgstr "памылка стварэньня \"%s\": %s\n"
 
@@ -5949,10 +6007,6 @@ msgstr ""
 #~ msgstr "агульная памылка"
 
 #, fuzzy
-#~ msgid "writing to file `%s'\n"
-#~ msgstr "запіс у stdout\n"
-
-#, fuzzy
 #~ msgid "can't create file `%s': %s\n"
 #~ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
diff --git a/po/ca.po b/po/ca.po
index 6fc12ff1a..7eaad3a84 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -45,72 +45,82 @@ msgstr "no s'ha pogut generar un prim amb pbits=%u qbits=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "no s'ha pogut generar un prim amb menys de %d bits\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "no s'ha pogut obrir «%s»\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "s'està escrivint la clau secreta a «%s»\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no es pot fer stat de «%s»: %s\n"
 
 # Descartar, deixar passar...  ignorar és un anglicisme.  ivb
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "«%s» no és un fitxer regular: es descarta\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fitxer random_seed és buit\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVÍS: el tamany del fitxer random_seed no és vàlid - no s'usarà\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no s'ha pogut llegir «%s»: %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no s'ha pogut escriure «%s»: %s\n"
 
 # No em passe! ;)  ivb
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVÍS: esteu usant un generador de nombres aleatoris insegur!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -124,7 +134,7 @@ msgstr ""
 "NO UTILITZEU CAP DADA GENERADA PER AQUEST PROGRAMA!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -133,7 +143,7 @@ msgstr ""
 "Si us plau, espereu mentre es genera entropia. Feu alguna tasca si\n"
 "vos ajuda no avorrir-vos, ja que ajudarà a la qualitat de la entropia.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -171,18 +181,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
@@ -191,11 +201,11 @@ msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -293,22 +303,27 @@ msgstr "La generació de claus ha fallat: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "signatura %s, algorisme de resum %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -318,75 +333,75 @@ msgstr ""
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "la capçalera d'armadura és invàlida: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "capçalera d'armadura: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "la capçalera de signatura clara és invàlida\n"
 
 # És un missatge d'error?  ivb
 # «Anidada» és un castellanisme.  Niuades?  Imbricades (SC)??  ivb
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "signatures en text pla imbricades\n"
 
 # FIXME: un-indiar. jm
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -406,13 +421,13 @@ msgstr ""
 # Destès? ivb
 # Desatès, sí. jm
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "La vostra selecció? "
@@ -590,8 +605,8 @@ msgstr "   (%d) RSA (només xifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
@@ -615,7 +630,7 @@ msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "ix del menú"
 
@@ -626,7 +641,7 @@ msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
@@ -700,7 +715,7 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -748,7 +763,7 @@ msgstr "Repetiu la contrasenya: "
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -758,14 +773,14 @@ msgstr "no s'ha pogut obrir «%s»\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
@@ -809,7 +824,7 @@ msgstr "hi ha una clau secreta per a la clau pública «%s»!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilitzeu l'opció «--delete-secret-keys» per a eliminar-la primer.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
@@ -828,7 +843,7 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVÍS: «%s» és un fitxer buit\n"
@@ -857,7 +872,7 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -872,7 +887,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
@@ -882,12 +897,12 @@ msgstr "no podeu usar %s mentre esteu en mode %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
@@ -967,84 +982,77 @@ msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "llig opcions del fitxer"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "la clau secreta és inusable"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1052,130 +1060,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1185,52 +1193,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detall"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1241,7 +1249,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1261,15 +1269,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1284,7 +1292,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1292,561 +1300,561 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, 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/gpg.c:1240
+#: g10/gpg.c:1247
 #, 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/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, 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/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, 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/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 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/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 #, 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/gpg.c:2839
+#: g10/gpg.c:2890
 #, 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 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/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, 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/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1854,28 +1862,28 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 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/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -1885,29 +1893,34 @@ msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, 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"
@@ -2298,18 +2311,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "la clau secreta és inusable"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "llig opcions del fitxer"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2433,162 +2442,162 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, 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:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, 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:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2598,22 +2607,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, 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:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2621,126 +2630,126 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, 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:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, 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:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
@@ -2765,51 +2774,51 @@ msgstr "error en crear «%s»: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2821,65 +2830,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2888,11 +2897,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2901,11 +2910,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2914,54 +2923,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2971,32 +2980,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3005,100 +3014,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3106,11 +3115,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3119,65 +3128,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3185,125 +3194,128 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "la clau secreta és inusable"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3455,116 +3467,116 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3572,19 +3584,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3594,7 +3606,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3603,58 +3615,58 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "l'ID d'usuari «%s» ja està revocat\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "l'ID d'usuari «%s» ja està revocat\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3663,184 +3675,184 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 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:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4199,7 +4211,7 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4366,30 +4378,30 @@ msgstr "no llegible per humans"
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4438,369 +4450,402 @@ msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "s'està cercant «%s» al servidor HKP %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "s'està cercant «%s» al servidor HKP %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Signatura correcta de \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -4959,29 +5004,29 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 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:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4997,7 +5042,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -5008,28 +5053,28 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "no es pot demanar la contrasenya en mode desatès\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5039,17 +5084,17 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
@@ -5100,23 +5145,23 @@ msgstr "És aquesta foto correcta (s/N/x)? "
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "No s'ha especificat cap raó"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "La clau ha estat substituïda"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no és vàlid"
 
@@ -5188,7 +5233,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "La vostra decisió? "
 
@@ -5272,66 +5317,74 @@ msgstr "AVÍS: Aquesta subclau ha estat revocada pel propietari!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Nota: La clau ha caducat!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "    No hi ha res que indique que la signatura pertany al seu propietari.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVÍS: La clau NO és de confiança!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          Probablement la signatura és FALSA.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVÍS: Aquesta clau no ve certificada per signatures prou fiables!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "No és segur que la signatura pertanya al seu propietari.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: es descarta: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: es descarta: la clau pública ja està present\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No heu especificat un ID d'usuari. (podeu usar «-r»)\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5339,33 +5392,33 @@ msgstr ""
 "\n"
 "Introduïu l'ID d'usuari. Finalitzeu amb una línia en blanc: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Usuari inexistent.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "es descarta: la clau pública ja s'ha especificat com a destinatari\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "La clau pública està desactivada.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau pública ja està establida\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: es descarta: la clau pública està desactivada\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
@@ -5408,35 +5461,35 @@ msgstr "no s'han pogut obrir les dades signades `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "el destinatari és anònim; es provarà la clau secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'acord, som el destinatari anònim.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la codificació antiga del DEK no està suportada\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritme de xifratge %d%s és desconegut o està desactivat\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: no s'ha trobat l'algoritme de xifratge %d en les preferències\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: la clau secreta %08lX caduca el %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
@@ -5446,65 +5499,65 @@ msgstr "ha fallat build_packet: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "A ser revocada per:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aquesta és una clau de revocació sensible)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha forçat l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocació per a «%s»\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta «%s»: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no està protegida!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5523,34 +5576,34 @@ msgstr ""
 "d'impressió de la vostra màquina podria emmagatzemar les dades i fer-les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ací)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introduïu una descripció opcional; finalitzeu amb una línia en blanc:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raó de la revocació: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "És açò correcte? "
@@ -5729,29 +5782,29 @@ msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatura de: «%s»\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "només podeu fer signatures separades amb claus d'estil PGP 2.x mentre esteu "
 "en mode --pgp2\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forçar l'algoritme de digest %s (%d) viola les preferències del destinatari\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzarà xifratge %s\n"
@@ -6021,132 +6074,136 @@ msgstr "el registre de confiança %lu no és del tipus demanat %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desconeguda"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 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:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, 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:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "si us plau, feu un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6403,6 +6460,11 @@ msgstr "Cancel·la"
 msgid "no card"
 msgstr "no és xifrat"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "no hi ha dades signades\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6463,26 +6525,34 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVÍS: esteu usant memòria insegura!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "si us plau, visiteu http://www.gnupg.org/faq.html per a més informació\n"
 
 # Últimament pense si «iniciar» no serà millor que «inicialitzar»?  ivb
 # Segons SC, hi ha diferència. jm
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operació no és possible sense memòria segura inicialitzada\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "llig opcions del fitxer"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "llig opcions del fitxer"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [caduca: %s]"
 
diff --git a/po/cs.po b/po/cs.po
index 447a9e5c2..6166824fb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -25,70 +25,80 @@ msgstr "nemohu vygenerovat prvo��slo s  pbits=%u qbits=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nemohu vygenerovat prvo��slo s m�n� ne� %d bity\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "nelze zam��t `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "zapisuji tajn� kl�� do `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nemohu pou��t p��kaz stat na `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nen� norm�ln� soubor - ignoruji\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: soubor random_seed je pr�zdn�\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "VAROV�N�: neplatn� velikost random_seed - soubor nepou�it\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nemohu ��st `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nemohu zapisovat do `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nemohu zav��t `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROV�N�: pou�it� gener�tor n�hodn�ch ��sel nen� bezpe�n�!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +112,7 @@ msgstr ""
 "NEPOU��VEJTE JAK�KOLIV DATA VYTVO�EN� T�MTO PROGRAMEM!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -111,7 +121,7 @@ msgstr ""
 "Pros�m �ekejte, je nutn� z�skat dostatek entropie. Aby jste se nenudili,\n"
 "m��ete na po��ta�i d�lat n�co jin�ho, zv���te tak kvalitu entropie.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -149,18 +159,18 @@ msgstr "odpov�� neobsahuje RSA modulus\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
@@ -169,11 +179,11 @@ msgstr "verifikace CHV%d se nezda�ila: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "p��stup k administr�torsk�m p��kaz�m nen� nakonfigurov�n\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
@@ -267,24 +277,29 @@ msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "podpis %s, hashovac� algoritmus %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "ov��en� administr�torsk�ho PIN je nyn� prost�ednictv�m tohoto p��kazu "
 "zak�z�no\n"
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -294,70 +309,70 @@ msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
 msgid "armor: %s\n"
 msgstr "ASCII k�dov�n�: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dov�n�: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �iteln�m form�tu\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "vno�en� podpisy v �iteln�m form�tu\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "neo�ek�van� ASCII armor: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "nespr�vn� ozna�en� ��dku m�nusy: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� radix64 znak %02X byl p�esko�en\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "p�ed�asn� konec souboru (��dn� CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "�patn� form�t CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "p�ed�asn� konec souboru (v pati�ce)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "chyba v pati�ce\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena ��dn� platn� data ve form�tu OpenPGP.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dov�n� ASCII: ��dek je del�� ne� %d znak�\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -375,12 +390,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "V� v�b�r? "
@@ -547,8 +562,8 @@ msgstr "   (2) �ifrovac� kl��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -568,7 +583,7 @@ msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
@@ -576,7 +591,7 @@ msgstr "ukon�it toto menu"
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
@@ -644,7 +659,7 @@ msgstr "administr�torsk� p��kazy jsou povoleny\n"
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -691,7 +706,7 @@ msgstr "Opakujte tento PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -701,14 +716,14 @@ msgstr "nelze otev��t `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
@@ -748,7 +763,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -767,7 +782,7 @@ msgstr "pou�it� �ifry: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je ji� zkomprimov�n\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROV�N�: soubor `%s' je pr�zdn�\n"
@@ -794,7 +809,7 @@ msgid ""
 msgstr ""
 "VAROV�N�: vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -808,7 +823,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
@@ -818,12 +833,12 @@ msgstr "pou�it� %s nen� v m�du %s dovoleno\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
@@ -897,78 +912,72 @@ msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+#: g10/export.c:65
+#, fuzzy
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "odstranit nepou�iteln� ��sti z kl��e"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -976,127 +985,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1106,55 +1115,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1162,7 +1171,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1180,17 +1189,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1200,7 +1209,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1208,79 +1217,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1288,21 +1297,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1310,7 +1319,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1318,459 +1327,459 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 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/gpg.c:2846
+#: g10/gpg.c:2897
 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/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1778,27 +1787,27 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -1806,27 +1815,32 @@ msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
 # c-format
-#: g10/getkey.c:1731
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
@@ -2215,15 +2229,12 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "odstranit nepou�iteln� ��sti z kl��e"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2349,299 +2360,299 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kl�� %s: \"%s\" %d podpis� odstran�no\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kl�� %s: \"%s\" %d ID u�ivatele odstran�no\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZN�MKA: S/N kl��e neodpov�d� S/N karty\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZN�MKA: prim�rn� kl�� je online a je ulo�en na kart�\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZN�MKA: sekund�rn� kl�� je online a je ulo�en na kart�\n"
 
@@ -2665,51 +2676,51 @@ msgstr "zdroj bloku kl��e `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2721,17 +2732,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2741,47 +2752,47 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 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:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" je p�ipraveno k podpisu."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2790,11 +2801,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2804,13 +2815,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2820,54 +2831,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2877,31 +2888,31 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro v�ce informac� vlo�te '?'): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2910,76 +2921,76 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "K dispozici je jen kontroln� sou�et kl��e nebo je kl�� na kart� - passphrase "
 "nelze zm�nit.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2987,11 +2998,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2999,157 +3010,161 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint kl��e"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "vyberte podkl�� N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybran� ID u�ivatele [* n��e jsou uvedeny relevantn� p��kazy]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybran� u�ivatelsk� ID lok�ln�"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybran� u�ivatelsk� ID d�v�ryhodn�m podpisem"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybran� u�ivatelsk� ID nerevokovateln�m podpisem"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "smazat vybran� ID u�ivatele"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "p�idat podkl��y"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout z�lo�n� kl�� na kartu"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "smazat vybran� podkl��e"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zm�nit datum expirace pro kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it vybran� u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovan�ho server kl��� pro vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybran�ch u�ivatelsk�ch ID"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "revokovat vybran� u�ivatelsk� ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "revokovat kl�� nebo vybran� podkl��e"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "uk�zat vybran� fotografick� ID"
 
-#: g10/keyedit.c:1445
-msgid "clean unusable parts from key"
-msgstr "odstranit nepou�iteln� ��sti z kl��e"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3291,109 +3306,109 @@ msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? (a/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? (a/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Preferovan� keyserver: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento kl�� revokoval %s kl��em %s\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kl�� m��e b�t revokov�n %s kl��em %s "
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "pou�it�: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "��slo karty: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3401,17 +3416,17 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3419,7 +3434,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3428,54 +3443,54 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:3212
-#, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "neplatn�"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "U�ivatelsk� ID \"%s\": je ji� odstran�no.\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3484,170 +3499,170 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 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:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden podkl��.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu expirace podkl��e.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu expirace prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje u�ivatelsk� ID s hashem %s\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podkl�� s indexem %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Kl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podkl�� %s je ji� revokov�n.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
@@ -3994,7 +4009,7 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4155,29 +4170,29 @@ msgstr "nen� v p��mo �iteln�m form�tu"
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "      Fingerprint kl��e ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
@@ -4224,359 +4239,392 @@ msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "vyhled�v�m \"%s\" na serveru %s\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 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:479
+#: g10/mainproc.c:483
 #, 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 %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nen� dostupn�; optimisticky se jej pokus�me nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Dobr� podpis od \"%s\""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, 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 %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -4724,34 +4772,34 @@ msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4762,27 +4810,27 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkov�m re�imu se nelze pt�t na heslo\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4791,17 +4839,17 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -4850,23 +4898,23 @@ msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
@@ -4932,7 +4980,7 @@ msgstr ""
 "Minim�ln� �rove� d�v�ry tohoto kl��e je: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
@@ -5005,68 +5053,76 @@ msgstr "VAROV�N�: Tento podkl�� byl revokov�n sv�m vlastn�kem!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento kl�� byl ozna�en jako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnost tohoto kl��e!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROV�N�: Tento kl�� nen� certifikov�n d�v�ryhodn�m podpisem!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nic nenazna�uje tomu, �e tento podpis pat�� vlastn�kovi kl��e.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROV�N�: NEd�v��ujeme tomuto kl��i!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravd�podobn� PAD�LAN�.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROV�N�: Tento kl�� nen� certifikov�n dostate�n� d�v�ryhodn�mi podpisy!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nen� jist�, zda tento podpis pat�� vlastn�kovi.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je ji� obsa�en v datab�zi\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nespecifikoval jste identifik�tor u�ivatele (user ID). M��ete pou��t \"-r\"\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "Aktu�ln� p��jemci:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5074,33 +5130,33 @@ msgstr ""
 "\n"
 "Napi�te identifik�tor u�ivatele (user ID). Ukon�ete pr�zdn�m ��dkem: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Takov� identifik�tor u�ivatele neexistuje.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je u� nastaven podle implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Ve�ejn� kl�� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: p�esko�eno: ve�ejn� kl�� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "��dn� platn� adresy\n"
 
@@ -5141,35 +5197,35 @@ msgstr "nemohu otev��t podepsan� data '%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; zkou��m tajn� kl�� %s ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my jsme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dov�n� DEK nen� podporov�no\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je nezn�m� nebo je zneplatn�n\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "VAROV�N�: v p�edvolb�ch p��jemce nenalezen �ifrovac� algoritmus %s\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnost tajn�ho kl��e %s skon�ila %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
@@ -5179,63 +5235,63 @@ msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Revokov�n:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� kl��)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� pov��en� revoka�n� certifik�t? (a/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro \"%s\" nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? (a/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5254,33 +5310,33 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? (a/N) "
 
@@ -5445,13 +5501,13 @@ msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5459,16 +5515,16 @@ msgstr ""
 "VAROV�N�: vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m "
 "p��jemce\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
@@ -5728,116 +5784,120 @@ 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:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "poui�it� modelu d�v�ry %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 "14 fixn� d�lka na kterou se p�ekl�d� see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[ revokov�n  ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[ expirov�n  ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[  nezn�m�   ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[nedefinovan�]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[  ��ste�n�  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[    pln�    ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[  absolutn� ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "nedefinov�na"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "��dn�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "��ste�n�"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "pln�"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "absolutn�"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nen� nutn� aktualizovat datab�zi d�v�ry s modelem `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m prove�te --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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 %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5845,7 +5905,7 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
@@ -6081,6 +6141,11 @@ msgstr "zru�eno"
 msgid "no card"
 msgstr "��dn� karta"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "chyb� podepsan� data\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "CHYBA: "
@@ -6139,19 +6204,19 @@ msgstr "oO"
 msgid "cC"
 msgstr "zZ"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROV�N�: Pou��van� pam� nen� bezpe�n�!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "V�ce informac� naleznete na adrese http://www.gnupg.cz/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
diff --git a/po/da.po b/po/da.po
index c9169b01c..074acb6d0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -26,70 +26,80 @@ msgstr ""
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "kan ikke �bne `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ADVARSEL: bruger usikker tilf�ldig-nummer-generator!!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,14 +113,14 @@ msgstr ""
 "BENYT IKKE DATA GENERERET AF DETTE PROGRAM!!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -149,18 +159,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
@@ -169,11 +179,11 @@ msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -272,22 +282,27 @@ msgstr "N�gleoprettelse annulleret.\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signatur fra: %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -297,72 +312,72 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "armor: %s\n"
 msgstr "panser: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "ugyldigt panserhoved: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "panserhoved: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr ""
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr ""
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "uforventet beskyttelse:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
@@ -378,12 +393,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Dit valg? "
@@ -563,8 +578,8 @@ msgstr "   (%d) ElGamal (krypt�r kun)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -588,7 +603,7 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
@@ -597,7 +612,7 @@ msgstr "afslut denne menu"
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
@@ -673,7 +688,7 @@ msgstr "konfliktende kommandoer\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -721,7 +736,7 @@ msgstr "Gentag kodes�tning: "
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -731,14 +746,14 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -778,7 +793,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -797,7 +812,7 @@ msgstr "signering fejlede: %s\n"
 msgid "`%s' already compressed\n"
 msgstr ""
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
@@ -822,7 +837,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -834,7 +849,7 @@ msgstr ""
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -844,12 +859,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -919,80 +934,72 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
+#: g10/export.c:65
+msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
+#: g10/export.c:67
+msgid "remove the passphrase from exported subkeys"
 msgstr ""
 
-#: g10/export.c:72
+#: g10/export.c:69
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "l�s indstillinger fra fil"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "remove unusable parts from key during export"
+msgstr "d�rlig hemmelig n�gle"
 
-#: g10/export.c:77
-msgid "remove the passphrase from exported subkeys"
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:330
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1000,132 +1007,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1135,57 +1142,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1205,16 +1212,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 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/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1224,7 +1231,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1232,588 +1239,588 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "RSA n�gle kan ikke bruges i denne version\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 #, 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/gpg.c:2839
+#: g10/gpg.c:2890
 #, 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1822,27 +1829,32 @@ msgstr "den givne politik-URL er ugyldig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
@@ -2133,18 +2145,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "d�rlig hemmelig n�gle"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "l�s indstillinger fra fil"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2267,296 +2275,296 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, 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:938
+#: g10/import.c:918
 #, 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:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -2581,51 +2589,51 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2633,439 +2641,442 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "d�rlig hemmelig n�gle"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3217,371 +3228,371 @@ msgstr "Gener�r en annull�rbar certifikat"
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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:2992
+#: g10/keyedit.c:2960
 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:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 #, 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:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "N�glen er beskyttet.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "N�glen er beskyttet.\n"
+
+#: g10/keyedit.c:3290
 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:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, 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:4113
+#: g10/keyedit.c:4060
 #, 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 #, 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:4412
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, 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:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3917,7 +3928,7 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4066,34 +4077,34 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4140,363 +4151,396 @@ msgstr "vis n�gler og signaturer"
 msgid "%s: keyring created\n"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "eksport�r n�gler til en n�gletjener"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "l�ser indstillinger fra `%s'\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "kan ikke �bne %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr ""
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "God signatur fra \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4646,34 +4690,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4681,29 +4725,29 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4712,17 +4756,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -4770,24 +4814,24 @@ msgstr "Er dette korrekt (j/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4859,7 +4903,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Dit valg? "
 
@@ -4935,101 +4979,109 @@ msgstr "ADVARSEL: Denne undern�gle er blevet tilbagekaldt af dens ejer!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Intet tyder p� at denne signatur tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ADVARSEL: Vi tror IKKE p� denne n�gle!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen er formentlig FORFALSKET.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det er ikke sikkert at signaturen tilh�rer ejeren.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du angav ikke en bruger-id. (du kan bruge \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Ingen s�dan bruger-id.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "udeladt: offentlig n�gle er allerede valgt som standard modtager\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: udelod: offentlign�gle er sl�et fra\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
@@ -5068,36 +5120,36 @@ msgstr ""
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
@@ -5107,68 +5159,68 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5179,34 +5231,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
@@ -5357,25 +5409,25 @@ msgstr "Kan ikke tjekke signatur: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
@@ -5631,125 +5683,129 @@ msgstr ""
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "tilf�j n�gle"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "udl�b"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "ukendt version"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5986,6 +6042,11 @@ msgstr ""
 msgid "no card"
 msgstr "ikke krypteret"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "krypt�r data"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6045,24 +6106,32 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Advarsel: benytter ubeskyttet hukommelse!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operation er ikke mulig uden beskyttet hukommelse indl�st\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "l�s indstillinger fra fil"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "l�s indstillinger fra fil"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr "N�gle udl�ber d. %s\n"
 
diff --git a/po/de.po b/po/de.po
index de5fd9e9f..2b3dd53cb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-10-06 11:59+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -25,71 +25,81 @@ msgstr "Eine Primzahl mit pbits=%u und qbits=%u kann nicht erzeugt werden\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "Eine Primzahl mit weniger als %d Bits kann nicht erzeugt werden\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "'%s' kann nicht ge�ffnet werden\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Status von '%s' ist nicht feststellbar: %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ist keine normale Datei - sie bleibt unbeachtet\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "'%s' ist unlesbar: %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kann '%s' nicht schreiben: %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kann '%s' nicht schliessen: %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "WARNUNG: Der Zufallsgenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +114,7 @@ msgstr ""
 "\n"
 
 # translated by wk
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +123,7 @@ msgstr ""
 "Zufalls wird gesammelt.  Bitte arbeiten Sie an etwas anderem, da\n"
 "so die Qualit�t der Zufallszahlen erh�ht werden kann.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -152,18 +162,18 @@ msgstr "Die Antwort enth�lt das RSA-Modulus nicht\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enth�lt den �ffentlichen RSA-Exponenten nicht\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN f�r CHV%d ist zu kurz; die Mindestl�nge betr�gt %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pr�fung des CHV%d fehlgeschlagen: %s\n"
@@ -172,11 +182,11 @@ msgstr "Pr�fung des CHV%d fehlgeschlagen: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
@@ -269,22 +279,27 @@ msgstr "Schl�sselerzeugung abgeschlossen (%d Sekunden)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ung�ltige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ung�ltige OpenPGP-Karte?\n"
@@ -294,70 +309,70 @@ msgstr "Kann auf %s nicht zugreifen - ung�ltige OpenPGP-Karte?\n"
 msgid "armor: %s\n"
 msgstr "ASCII-H�lle: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "Ung�ltige ASCII-H�lle"
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "ASCII-H�lle: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "Unerwartete ASCII-H�lle: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -375,12 +390,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
@@ -550,8 +565,8 @@ msgstr "   (2) Verschl�sselungs-Schl�ssel\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schl�ssel\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
@@ -571,7 +586,7 @@ msgstr "Geheime Teile des Schl�ssels sind nicht vorhanden\n"
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schl�ssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
@@ -579,7 +594,7 @@ msgstr "Men� verlassen"
 msgid "show admin commands"
 msgstr "Zeige Admin-Kommandos"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
@@ -647,7 +662,7 @@ msgstr "Admin-Befehle sind erlaubt\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -696,7 +711,7 @@ msgstr "Geben Sie die PIN nochmal ein: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -706,14 +721,14 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
@@ -755,7 +770,7 @@ msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -776,7 +791,7 @@ msgstr "benutze Cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
@@ -807,7 +822,7 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %"
 "s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -823,7 +838,7 @@ msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
@@ -833,12 +848,12 @@ msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschl�sselte Daten\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
@@ -914,82 +929,75 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "Optionen aus der Datei lesen"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "Widerrufsschl�ssel f�r `%s' nicht gefunden\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "unbrauchbarer geheimer Schl�ssel"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "Exportieren geheimer Schl�ssel ist nicht erlaubt\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schl�ssel %s: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %s: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Speichern des Schl�ssels fehlgeschlagen: %s\n"
 
 # translated by wk
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schl�ssel %s hat keine einfache SK-Pr�fsumme\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -997,127 +1005,127 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel auflisten und pr�fen"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "Daten auf einer Karte �ndern"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "PIN einer Karte �ndern"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1127,51 +1135,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1180,7 +1188,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1200,17 +1208,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1220,7 +1228,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1228,73 +1236,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses f�r Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1302,20 +1310,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1323,474 +1331,474 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige Schl�sselserver-Option\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import-Option\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import-Option\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export-Option.\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "Ung�ltige Export-Option\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Listen-Option.\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "Ung�ltige Listen-Option\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "Ung�ltige �berpr�fungs-Option\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 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/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschl�sselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1798,28 +1806,28 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -1828,29 +1836,34 @@ msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %s, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschl�ssel zum �ffentlichen Unterschl�ssel %s - "
 "�bergangen\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Zweitschl�ssel %s wird anstelle des Hauptschl�ssels %s verwendet\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -2246,18 +2259,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "unbrauchbarer geheimer Schl�ssel"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "Optionen aus der Datei lesen"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2381,316 +2390,316 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schl�ssel %s: Keine User-ID\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %s: PKS Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schl�ssel %s: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, 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:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, 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:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
@@ -2715,51 +2724,51 @@ msgstr "Fehler beim Erstellen von `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2773,17 +2782,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2793,48 +2802,48 @@ msgstr ""
 "Eine Tiefe gr��er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
 "Trust-Signatures f�r Sie zu machen.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Unterschrift einzuschr�nken,\n"
 "oder nur die Eingabetaste f�r keine Domain\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2843,11 +2852,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2856,13 +2865,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2871,44 +2880,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2916,11 +2925,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2930,33 +2939,33 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2965,14 +2974,14 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2980,85 +2989,85 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3066,11 +3075,11 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3078,181 +3087,184 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "unbrauchbarer geheimer Schl�ssel"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3402,110 +3414,110 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3513,20 +3525,20 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
 # translated by wk
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3534,7 +3546,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als prim�r markiert.  Dieses Kommando kann\n"
 "dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3544,54 +3556,54 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "User-ID \"%s\" ist bereits widerrufen\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "ung�ltig"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User-ID \"%s\" ist bereits widerrufen\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3601,37 +3613,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3639,146 +3651,146 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4130,7 +4142,7 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4293,29 +4305,29 @@ msgstr "nicht als Klartext darstellbar"
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
@@ -4362,368 +4374,403 @@ msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "suche nach \"%s\" auf HKP-Server %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "suche nach \"%s\" auf HKP-Server %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr ""
+"WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr ""
+"WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame L�nge f�r einen verschl�sselten Sitzungsschl�ssel (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschl�sselter Sitzungsschl�ssel\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschl�sselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschl�sselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschl�sselte Daten\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "Entschl�sselung erfolgreich\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integrit�tsgesch�tzt (integrity protected)\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Korrekte Unterschrift von \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "Bin�re"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste gepr�ft.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -4874,35 +4921,35 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4913,28 +4960,28 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4944,17 +4991,17 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
@@ -5006,23 +5053,23 @@ msgstr "Ist dieses Bild richtig? (j/N) "
 msgid "unable to display photo ID!\n"
 msgstr "Die Photo ID kann nicht angezeigt werden!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Schl�ssel ist �berholt"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schl�ssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Schl�ssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr g�ltig"
 
@@ -5093,7 +5140,7 @@ msgid ""
 "\n"
 msgstr "Die minimale Trust-Ebene f�r diesen Schl�ssel betr�gt: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
@@ -5179,73 +5226,81 @@ msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Hinweis: Dieser Schl�ssel wurde abgeschaltet.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Sie haben keine User-ID angegeben (Sie k�nnen die Option \"-r\" verwenden).\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 #, fuzzy
 msgid "Current recipients:\n"
 msgstr "Derzeitige Voreinstellungenliste:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5253,34 +5308,34 @@ msgstr ""
 "\n"
 "Geben Sie die User-ID ein. Beenden mit einer leeren Zeile: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "�bersprungen: �ffentlicher Schl�ssel bereits als Standardempf�nger gesetzt\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist abgeschaltet.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel ist abgeschaltet\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -5320,35 +5375,35 @@ msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Ungenannter Empf�nger; Versuch mit geheimen Schl�ssel %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Alles klar, wir sind der ungenannte Empf�nger.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "alte Kodierung des DEK wird nicht unterst�tzt\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "Versch�sselungsverfahren %d%s ist unbekannt oder abgeschaltet\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "Hinweis: geheimer Schl�ssel %08lX verf�llt am %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schl�ssel wurde widerrufen"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
@@ -5358,66 +5413,66 @@ msgstr "\"build_packet\" fehlgeschlagen: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Schl�ssel soll widerrufen werden von:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dies ist ein \"sensitiver\" Widerrufsschl�ssel)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII H�lle erzwungen\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Widerrufzertifikat erzeugt.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Widerrufsschl�ssel f�r `%s' nicht gefunden\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
 # translated by wk
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5437,34 +5492,34 @@ msgstr ""
 "Drucksystem kann unter Umst�nden eine Kopie anderen Nutzern zug�nglich\n"
 "machen.\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich m�chten Sie hier %d ausw�hlen)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund f�r Widerruf: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ist das richtig? "
@@ -5648,30 +5703,30 @@ msgstr "Pr�fung der erstellten Unterschrift ist fehlgeschlagen: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s Unterschrift von: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
@@ -5938,130 +5993,134 @@ msgstr "Vertrauenssatz %lu ist nicht von der angeforderten Art %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[widerrufen]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[verfallen]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "unbekannt"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 #, fuzzy
 msgid "[marginal]"
 msgstr "marginal"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 #, fuzzy
 msgid "[ultimate]"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "unbestimmt"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "niemals   "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "vollst�ndig"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "uneingeschr�nkt"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�ffentlicher Schl�ssel %08lX nicht gefunden: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "Bitte ein --check-trustdb durchf�hren\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
 # translated by wk
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "keine uneingeschr�nkt vertrauensw�rdige Schl�ssel gefunden\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, 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:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6300,6 +6359,11 @@ msgstr "Abbruch"
 msgid "no card"
 msgstr "keine Karte"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "keine unterschriebene Daten\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "FEHLER: "
@@ -6358,25 +6422,33 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "WARNUNG: Sensible Daten k�nnten auf Platte ausgelagert werden.\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "siehe http://www.gnupg.org/faq.html f�r weitere Informationen\n"
 
 # "  Um dies zu vermeiden, kann das Programm suid(root) installiert werden.\n"
 # "  Bitte wenden Sie sich hierzu an den Systemadministrator.\n"
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "Vorgang ist ohne sicheren Hauptspeicher nicht m�glich\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
+#, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "Optionen aus der Datei lesen"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "Optionen aus der Datei lesen"
+
 #~ msgid "expired: %s)"
 #~ msgstr "verf�llt: %s)"
 
diff --git a/po/el.po b/po/el.po
index e8ae0636b..394642581 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -24,72 +24,82 @@ msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "�������� ��������� ������ ������� �� �������� ��� %d bits\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "��� ����������� ������� �������� ���������\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "�������� ��������� ��� `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "�������� ����� ����������� ��� �� `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ��� ����� �������� ������ - ���������\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "��������: �� ������ random_seed ����� �����\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "�������������: �� ������ ������� ������� random_seed - ���\n"
 "��������������\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�������������: ����� �� �������� ���������� ������� �������!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +112,7 @@ msgstr ""
 "�� ��������������� �������� ��� ����� �������� ��� ���� �� ���������!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -111,7 +121,7 @@ msgstr ""
 "������ ����������, � �������� ��������������. ����� ��� ���� �������\n"
 "��� �� ��� ���������, ����� ���� �� ��������� ��� �������� ��� ��������.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -150,18 +160,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
@@ -170,11 +180,11 @@ msgstr "keyserver �������� �������: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -272,22 +282,27 @@ msgstr "� ���������� �������� �������: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s ��������, ���������� ��������� %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -297,72 +312,72 @@ msgstr "�� �������� ������ OpenPGP ��������.\n"
 msgid "armor: %s\n"
 msgstr "��������: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "�� ������ ����������� ���������: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "����������� ���������: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "�� ������ ����������� clearsig\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "����������� �� ���������������� ���������\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "�� ����������� ��������:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -380,13 +395,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "� ������� ���; "
@@ -565,8 +580,8 @@ msgstr "   (%d) RSA (��� ������������� ����)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -590,7 +605,7 @@ msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
@@ -599,7 +614,7 @@ msgstr "����������� ����� ��� �����"
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
@@ -675,7 +690,7 @@ msgstr "������������� �������\n"
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -720,7 +735,7 @@ msgstr "����������� �� ����� ������: "
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,14 +745,14 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
@@ -780,7 +795,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -799,7 +814,7 @@ msgstr "����� ��� ���������������: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ��� �����������\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�������������: `%s' ����� ��� ����� ������\n"
@@ -830,7 +845,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,7 +861,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
@@ -856,12 +871,12 @@ msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
@@ -937,7 +952,7 @@ msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -945,76 +960,69 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "�������� �������� ��� ������"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "�� ��������������� ������� ������"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1022,128 +1030,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1153,51 +1161,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "���������"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1213,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1225,15 +1233,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1243,7 +1251,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1251,564 +1259,564 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1816,28 +1824,28 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1846,28 +1854,33 @@ msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -2253,18 +2266,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "�� ��������������� ������� ������"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "�������� �������� ��� ������"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2388,307 +2397,307 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
@@ -2713,51 +2722,51 @@ msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2770,63 +2779,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2835,11 +2844,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2848,12 +2857,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2862,43 +2871,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2906,11 +2915,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2920,32 +2929,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2954,21 +2963,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2976,14 +2985,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2991,65 +3000,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3057,191 +3066,194 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "�� ��������������� ������� ������"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3393,112 +3405,112 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3506,19 +3518,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3526,7 +3538,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3535,55 +3547,55 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "�� user ID \"%s\" ���� ��� ���������\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "�� user ID \"%s\" ���� ��� ���������\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3593,38 +3605,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3632,146 +3644,146 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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"
@@ -4125,7 +4137,7 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4291,30 +4303,30 @@ msgstr "�� ����������"
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4361,363 +4373,396 @@ msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "���� �������� ��� \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -4871,34 +4916,34 @@ msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4910,28 +4955,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4941,17 +4986,17 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
@@ -5001,23 +5046,23 @@ msgstr "����� ���� � ���������� ����� (y/N/q); "
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
@@ -5088,7 +5133,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
@@ -5172,69 +5217,77 @@ msgstr ""
 msgid "Note: This key has been disabled.\n"
 msgstr "��������: ���� �� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "��������: ���� �� ������ ���� �����!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ������������ "
 "��������!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         ��� ������� ������� ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�������������: ��� �������������� ���� �� ������!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         � �������� ������ ����� ������������.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "�������������: ���� �� ������ ��� ���� ������������ �� ���������\n"
 "������� ������������!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         ��� ����� ������ ��� � �������� ������ ���� ���������.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ������������: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ������������: ������� ������ ����� ��� �����\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "��� �������� ��� user ID. (��������������� �� \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5242,34 +5295,34 @@ msgstr ""
 "\n"
 "�������������� �� user ID. ����� �� ��� ����� ������: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "��� ������� ���� �� user ID.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "������������: ������� ������ ���� ��� ������� ��� �� ������� ����������\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "�� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ������������: �� ������� ������ ���� ���������������.\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "������ ������ ���������\n"
 
@@ -5308,35 +5361,35 @@ msgstr "�������� ��������� �������������� ��������� `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "�������� ���������� ������ �������� �������� %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "�������, ������� � �������� ����������.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "������ ������������ ��� DEK ��� �������������\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "� ���������� �������������� %d%s ����� �������� � �����������������\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "��������: � ���������� �������������� %d ��� ����� ���� ��������\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
@@ -5346,65 +5399,65 @@ msgstr "build_packet �������: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "���� �������� ���:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(���� ����� ��� ��������� ������ ���������)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5423,33 +5476,33 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
@@ -5622,13 +5675,13 @@ msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s �������� ���: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5636,16 +5689,16 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
@@ -5910,126 +5963,130 @@ msgstr "� ������� trust %lu ��� ����� ��� ���������� ����� %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[����������]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[�������]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "�������"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "����     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "�������� ����� ��� --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6267,6 +6324,11 @@ msgstr "�������"
 msgid "no card"
 msgstr "�� ���������������"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "��� �������� ������������� ��������\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6326,23 +6388,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "�������������: ����� �� �������� ������!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "����� �� http://www.gnupg.org/faq.html ��� ������������ �����������\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "�������� �������� ��� ������"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "�������� �������� ��� ������"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [�����: %s]"
 
diff --git a/po/eo.po b/po/eo.po
index 71741e5dc..8e6effaad 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -24,71 +24,81 @@ msgstr ""
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "ne povas malfermi '%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "skribas sekretan �losilon al '%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ne povas stat-i '%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' ne estas normala dosiero - ignorita\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "noto: dosiero random_seed estas malplena\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "averto: nevalida grando de la dosiero random_seen - ne uzita\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "ne povas legi '%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "ne povas skribi '%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVERTO: uzas malsekuran stokastilon!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,14 +112,14 @@ msgstr ""
 "NE UZU DATENOJN KREITAJN DE �I TIU PROGRAMO!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -147,18 +157,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
@@ -167,11 +177,11 @@ msgstr "Kreado de �losiloj malsukcesis: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -269,22 +279,27 @@ msgstr "Kreado de �losiloj malsukcesis: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s-subskribo de: %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -294,72 +309,72 @@ msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 msgid "armor: %s\n"
 msgstr "kiraso: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "nevalida kiraso�apo: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "kiraso�apo: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "nevalida �apo de klarteksta subskribo\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "ingitaj klartekstaj subskriboj\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neatendita kiraso:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -377,13 +392,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Via elekto? "
@@ -562,8 +577,8 @@ msgstr "   (%d) RSA (nur �ifri)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -587,7 +602,7 @@ msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
@@ -596,7 +611,7 @@ msgstr "forlasi �i tiun menuon"
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
@@ -672,7 +687,7 @@ msgstr "malkongruaj komandoj\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -720,7 +735,7 @@ msgstr "Ripetu pasfrazon: "
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,14 +745,14 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
@@ -779,7 +794,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -798,7 +813,7 @@ msgstr "subskribado malsukcesis: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
@@ -823,7 +838,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -835,7 +850,7 @@ msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, fuzzy, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
@@ -845,12 +860,12 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
@@ -922,82 +937,74 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
+#: g10/export.c:65
+msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
+#: g10/export.c:67
+#, fuzzy
+msgid "remove the passphrase from exported subkeys"
+msgstr "revoki flankan �losilon"
 
-#: g10/export.c:72
+#: g10/export.c:69
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "legi la opciojn el dosiero"
+msgid "remove unusable parts from key during export"
+msgstr "neuzebla sekreta �losilo"
 
-#: g10/export.c:75
-msgid "export the smallest key possible"
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:77
-#, fuzzy
-msgid "remove the passphrase from exported subkeys"
-msgstr "revoki flankan �losilon"
-
-#: g10/export.c:330
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1005,128 +1012,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1136,51 +1143,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1188,7 +1195,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1208,15 +1215,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1226,7 +1233,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1234,559 +1241,559 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 #, 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/gpg.c:2839
+#: g10/gpg.c:2890
 #, 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1795,29 +1802,29 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1826,27 +1833,32 @@ msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -2221,18 +2233,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "neuzebla sekreta �losilo"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "legi la opciojn el dosiero"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2356,297 +2364,297 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -2671,51 +2679,51 @@ msgstr "eraro dum kreado de '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d subskriboj ne kontrolitaj pro manko de �losiloj\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d uzantidentigiloj sen valida mem-subskribo estis trovitaj\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2728,64 +2736,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2796,7 +2804,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2805,7 +2813,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2816,12 +2824,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2832,7 +2840,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2841,53 +2849,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 #, fuzzy
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�u vi volas, ke via subskribo eksvalidi�u je la sama tempo? (j/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 #, fuzzy
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 #, fuzzy
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "�i tiu mesa�o povas ne esti uzebla de PGP 2.x\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2896,31 +2904,31 @@ msgstr ""
 "Kiom zorge vi kontrolis, ke la �losilo, kiun vi subskribos, vere apartenas\n"
 "al la supre nomita persono? Se vi ne scias la respondon, donu \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2929,98 +2937,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3028,11 +3036,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3040,180 +3048,183 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "neuzebla sekreta �losilo"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3365,136 +3376,136 @@ msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3503,55 +3514,55 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 #, 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
+
+#: g10/keyedit.c:3290
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3561,181 +3572,181 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 #, 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:3376
+#: g10/keyedit.c:3321
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 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:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, 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:4113
+#: g10/keyedit.c:4060
 #, 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 #, 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:4412
+#: g10/keyedit.c:4359
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4089,7 +4100,7 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4253,34 +4264,34 @@ msgstr "ne homlegebla"
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4327,364 +4338,397 @@ msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Bona subskribo de \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -4835,34 +4879,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4873,28 +4917,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4904,17 +4948,17 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -4961,23 +5005,23 @@ msgstr "�u tio estas �usta (j/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
@@ -5050,7 +5094,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Via decido? "
 
@@ -5132,67 +5176,75 @@ msgstr "AVERTO: �i tiu sub�losilo estas revokita de sia posedanto!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Noto: �i tiu �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Noto: �i tiu �losilo eksvalidi�is!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVERTO: �i tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Estas nenia indiko, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTO: Ni NE fidas �i tiun �losilon!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La subskribo ver�ajne estas FALSA.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTO: �i tiu �losilo ne estas atestita kun sufi�e fidataj subskriboj!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ne estas certe, ke la subskribo apartenas al la posedanto.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorita: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorita: publika �losilo jam �eestas\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Vi ne specifis uzantidentigilon. (Vi povas uzi \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5200,33 +5252,33 @@ msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorita: publika �losilo jam difinita kiel implicita ricevonto\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Publika �losilo estas mal�altita.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorita: publika �losilo estas mal�altita\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
@@ -5265,36 +5317,36 @@ msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nenomita ricevonto; provas per sekreta �losilo %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bone; ni estas la nenomita ricevonto.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "malnova kodado de DEK ne estas realigita\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrad-metodo %d%s estas nekonata a� mal�altita\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -5304,68 +5356,68 @@ msgstr "aktualigo malsukcesis: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5376,37 +5428,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
@@ -5567,27 +5619,27 @@ msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 #, fuzzy
 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:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
@@ -5848,125 +5900,129 @@ msgstr "fido-registro %lu ne havas petitan specon %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "rev"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "eksval"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nekonata versio"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6204,6 +6260,11 @@ msgstr "nuligita de uzanto\n"
 msgid "no card"
 msgstr "ne �ifrita"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "mankas subskribitaj datenoj\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6264,24 +6325,32 @@ msgstr ""
 msgid "cC"
 msgstr "k"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Averto: uzas malsekuran memoron!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "bonvolu vidi http://www.gnupg.org/faq.html por pliaj informoj\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operacio ne eblas sen sekura memoro kun komenca valoro\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "legi la opciojn el dosiero"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "legi la opciojn el dosiero"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [eksvalidi�os: %s]"
 
diff --git a/po/es.po b/po/es.po
index 70e0a551b..a99a02bce 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -28,22 +28,32 @@ msgstr "no se puede generar un primo con pbits=%u qbits=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "no se puede generar un primo con menos de %d bits\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "no se puede bloquear `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "escribiendo clave privada en `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "no se puede obtener informaci�n de `%s': %s\n"
@@ -53,51 +63,51 @@ msgstr "no se puede obtener informaci�n de `%s': %s\n"
 # Sugerencia a la sugerencia: �qu� tal omitido? (pasar en silencio una
 # cosa; excluirla de lo que se habla o escribe) dice el diccionario.
 # Bien. Tambi�n se puede poner "descartado".
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s` no es un fichero regular - descartado\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "nota: el fichero de semillas aleatorias est� vac�o\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATENCI�N: tama�o incorrecto del fichero de semillas aleatorias - no se usa\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "no se puede leer `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "no se puede escribir `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "no se puede cerrar `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ATENCI�N: �usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -111,7 +121,7 @@ msgstr ""
 "�NO USE DATOS GENERADOS POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -121,7 +131,7 @@ msgstr ""
 "el ordenador mientras tanto si eso hace que no se aburra, porque eso\n"
 "mejorar� la calidad de la entrop�a.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -160,18 +170,18 @@ msgstr "la respuesta no incluye el m�dulo RSA\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
@@ -180,11 +190,11 @@ msgstr "la verificaci�n CHV%d fall�: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a �rdenes de administrador no est� configurado\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
@@ -279,22 +289,27 @@ msgstr "generaci�n de clave completada (%d segundos)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "firma %s, algoritmo de resumen %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [firmas hechas: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -304,70 +319,70 @@ msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "cabecera de armadura inv�lida: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara inv�lida\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "armadura inesperada: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -385,12 +400,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Su elecci�n: "
@@ -559,8 +574,8 @@ msgstr "   (2) Clave de cifrado\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -580,7 +595,7 @@ msgstr "las partes secretas de la clave no est�n disponibles\n"
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "sale de este men�"
 
@@ -588,7 +603,7 @@ msgstr "sale de este men�"
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
@@ -656,7 +671,7 @@ msgstr "Se permiten �rdenes de administrador\n"
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -701,7 +716,7 @@ msgstr "Repita este PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -711,14 +726,14 @@ msgstr "no se puede abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
@@ -757,7 +772,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -776,7 +791,7 @@ msgstr "usando cifrado %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' ya est� comprimido\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATENCI�N `%s' es un fichero vac�o\n"
@@ -804,7 +819,7 @@ msgstr ""
 "AVISO: forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -820,7 +835,7 @@ msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "no puede usar %s en modo %s\n"
@@ -830,12 +845,12 @@ msgstr "no puede usar %s en modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
@@ -910,75 +925,68 @@ msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "lee opciones del fichero"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "clave secreta inutilizable"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -986,7 +994,7 @@ msgstr "ATENCI�N: no se ha exportado nada\n"
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -994,127 +1002,127 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1124,47 +1132,47 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1172,7 +1180,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # 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/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1180,7 +1188,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1200,15 +1208,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1218,7 +1226,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1226,71 +1234,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, 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/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1298,18 +1306,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1317,448 +1325,448 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1766,11 +1774,11 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1778,28 +1786,28 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -1807,26 +1815,31 @@ msgstr "la URL del servidor de claves preferido no es v�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
@@ -2219,18 +2232,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "clave secreta inutilizable"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "lee opciones del fichero"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2356,298 +2365,298 @@ msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
@@ -2671,51 +2680,51 @@ msgstr "%s: problema lectura del bloque de clave: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2727,17 +2736,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2747,46 +2756,46 @@ msgstr ""
 "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2795,11 +2804,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2808,11 +2817,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2821,43 +2830,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2865,11 +2874,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2879,31 +2888,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2912,76 +2921,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2989,11 +2998,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3001,159 +3010,162 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "clave secreta inutilizable"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3295,109 +3307,109 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3405,17 +3417,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3423,7 +3435,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3432,55 +3444,55 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3489,171 +3501,171 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, 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:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
@@ -4000,7 +4012,7 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4161,29 +4173,29 @@ msgstr "ilegible"
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
@@ -4230,359 +4242,392 @@ msgstr "%lu claves memorizadas (%lu firmas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVISO: las opciones de servidor de claves `%s' no se usan en esta "
 "plataforma\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "buscando \"%s\" de %s servidor %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "buscando \"%s\" de %s\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Firma correcta de \"%s\""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -4731,34 +4776,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 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:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4769,27 +4814,27 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposible pedir frase contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4798,17 +4843,17 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
@@ -4857,23 +4902,23 @@ msgstr "�Es correcta la foto? (s/n) "
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
@@ -4941,7 +4986,7 @@ msgstr ""
 "El m�nimo nivel de confianza para esta clave es: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "�Su decisi�n? "
 
@@ -5019,68 +5064,76 @@ msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta clave est� deshabilitada.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave ha caducado!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "          No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con firmas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitida: clave p�blica ya presente\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "No ha especificado un ID de usuario (puede usar \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "Destinatarios actuales:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5088,33 +5141,33 @@ msgstr ""
 "\n"
 "Introduzca ID de usuario. Acabe con una l�nea vac�a: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "omitida: clave p�blica ya designada como destinataria por defecto\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Clave p�blica deshabilitada.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitida: clave p�blica deshabilitada\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -5153,35 +5206,35 @@ msgstr "imposible abrir datos firmados `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; probando clave secreta %s ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "de acuerdo, somos el destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la antigua codificaci�n de la DEK no puede usarse\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifrado %d%s desconocido o desactivado\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: el cifrado %s no aparece en las preferencias del receptor\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: clave secreta %s caduc� el %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
@@ -5191,63 +5244,63 @@ msgstr "construcci�n del paquete fallida: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Ser� revocado por:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Este es una clave de revocaci�n confidencial)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Certificado de revocaci�n creado.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "no se encuetran claves de revocaci�n para \"%s\"\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta \"%s\" no encontrada: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5266,33 +5319,33 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? (s/N) "
 
@@ -5457,13 +5510,13 @@ msgstr "la comprobaci�n de la firma creada fall�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s firma de: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5471,15 +5524,15 @@ msgstr ""
 "AVISO: forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
@@ -5738,121 +5791,125 @@ msgstr "registro de confianza %lu no es del tipo requerido %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "imposible usar modelo de confianza (%d) - asumiendo el modelo %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "usando %s como modelo de confianza\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "13 no apto para supersticiosos"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[  revocada ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[  caducada ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[desconocida]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[no definida]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[   dudosa  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[   total   ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[  absoluta ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "no definido"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "nunca"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "dudosa"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "total"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "absoluta"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 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:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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"
 "con el modelo de confianza `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "no es necesario comprobar la base de datos de confianza\n"
 "con el modelo `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "clave p�blica %s no encontrada: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "por favor haga un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5860,7 +5917,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6121,6 +6178,11 @@ msgstr "cancelado"
 msgid "no card"
 msgstr "no hay tarjeta"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "no hay datos firmados\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "ERROR: "
@@ -6182,22 +6244,30 @@ msgstr "vV"
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATENCI�N: �se est� usando memoria insegura!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor, vea http://www.gnupg.org/faq.html para m�s informaci�n\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operaci�n imposible sin memoria segura inicializada\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
+#, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "lee opciones del fichero"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "lee opciones del fichero"
+
 #~ msgid "expired: %s)"
 #~ msgstr "caduc�: %s)"
 
diff --git a/po/et.po b/po/et.po
index 5684923ff..1c1a47488 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -24,70 +24,80 @@ msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "v�hem kui %d bitiga ei saa algarvu genereerida\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "entroopia kogumise moodul puudub\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "`%s' ei �nnestu avada\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "ei �nnestu lugeda `%s' atribuute: %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' ei ole tavaline fail - ignoreerin\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "m�rkus: random_seed fail on t�hi\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "HOIATUS: vigane random_seed faili suurus - ei kasuta\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "`%s' ei �nnestu lugeda: %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "`%s' ei �nnestu kirjutada: %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "HOIATUS: kasutan ebaturvalist juhuarvude generaatorit!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -101,7 +111,7 @@ msgstr ""
 "�RGE KASUTAGE SELLE PROGRAMMI POOLT GENEREERITUD ANDMEID!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -110,7 +120,7 @@ msgstr ""
 "Palun oodake, kogutakse entroopiat. Igavuse v�ltimiseks v�ite teha arvutiga\n"
 "mingit t��d, see t�stab ka entroopia kvaliteeti.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -148,18 +158,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
@@ -168,11 +178,11 @@ msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -270,22 +280,27 @@ msgstr "V�tme genereerimine eba�nnestus: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -295,72 +310,72 @@ msgstr "ei leia OpenPGP andmeid.\n"
 msgid "armor: %s\n"
 msgstr "pakend: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "vigane pakendi p�is: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "pakendi p�is: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "vigane avateksti allkirja p�is\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "avateksti allkirjad �ksteise sees\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "ootamatu pakend:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -377,13 +392,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Teie valik? "
@@ -562,8 +577,8 @@ msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -587,7 +602,7 @@ msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
@@ -596,7 +611,7 @@ msgstr "v�lju sellest men��st"
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
@@ -672,7 +687,7 @@ msgstr "vastuolulised k�sud\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -717,7 +732,7 @@ msgstr "Korrake parooli: "
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -727,14 +742,14 @@ msgstr "`%s' ei �nnestu avada\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
@@ -776,7 +791,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -795,7 +810,7 @@ msgstr "kasutan �iffrit %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "HOIATUS: `%s' on t�hi fail\n"
@@ -822,7 +837,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -836,7 +851,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
@@ -846,12 +861,12 @@ msgstr "%s ei ole moodis %s lubatud.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
@@ -926,82 +941,77 @@ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "loe v�tmed failist"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
+msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
+"`%s' jaoks pole t�histamise v�tmeid\n"
+"\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "mittekasutatav salajane v�ti"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1009,128 +1019,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1140,51 +1150,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1192,7 +1202,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1212,15 +1222,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1230,7 +1240,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1238,551 +1248,551 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1790,28 +1800,28 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1820,29 +1830,34 @@ msgstr "antud allkirja poliisi URL on vigane\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, 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"
@@ -2216,18 +2231,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "mittekasutatav salajane v�ti"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "loe v�tmed failist"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2351,301 +2362,301 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, 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:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, 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:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -2670,51 +2681,51 @@ msgstr "viga `%s' loomisel: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2727,63 +2738,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2792,11 +2803,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2805,11 +2816,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2818,54 +2829,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2875,32 +2886,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2909,100 +2920,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3010,11 +3021,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3022,179 +3033,182 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "mittekasutatav salajane v�ti"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3345,112 +3359,112 @@ msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3458,19 +3472,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3478,7 +3492,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3487,55 +3501,55 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3544,177 +3558,177 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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"
@@ -4067,7 +4081,7 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4226,30 +4240,30 @@ msgstr "pole inimese poolt loetav"
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4296,359 +4310,392 @@ msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "otsin \"%s\" HKP serverist %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "otsin \"%s\" HKP serverist %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Korrektne allkiri kasutajalt \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -4800,34 +4847,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4838,28 +4885,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4869,17 +4916,17 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -4929,23 +4976,23 @@ msgstr "On see foto �ige (j/E/v)? "
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
@@ -5016,7 +5063,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
@@ -5094,67 +5141,75 @@ msgstr "HOIATUS: See alamv�ti on omaniku poolt t�histatud!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "M�rkus: See v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "M�rkus: See v�ti on aegunud!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "HOIATUS: Seda v�tit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Ei ole midagi, mis n�itaks, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "HOIATUS: Me EI usalda seda v�tit!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allkiri on t�en�oliselt V�LTSING.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "HOIATUS: Seda v�tit ei ole sertifitseeritud piisavalt usaldatava "
 "allkirjaga!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole kindel, et allkiri kuulub omanikule.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Te ei m��ranud kasutaja IDd. (v�ite kasutada v�tit \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5162,33 +5217,33 @@ msgstr ""
 "\n"
 "Sisestage kasutaja ID.  L�petage t�hja reaga: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "j�tsin vahele: avalik v�ti on juba vaikimisi saaja\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Avalik v�ti on blokeeritud.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: j�tsin vahele: avalik v�ti on blokeeritud\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
@@ -5227,35 +5282,35 @@ msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anon��mne saaja; proovin salajast v�tit %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, me oleme anon��mne teate saaja.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vana DEK kodeerimine ei ole toetatud\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifri algoritm %d%s on tundmatu v�i blokeeritud\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "M�RKUS: �ifri algoritm %d puudub eelistustes\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
@@ -5265,67 +5320,67 @@ msgstr "build_packet eba�nnestus: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "T�histaja:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(See on tundlik t�histamise v�ti)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5346,33 +5401,33 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
@@ -5530,28 +5585,28 @@ msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s allkiri kasutajalt: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
@@ -5813,125 +5868,129 @@ msgstr "usalduse kirje %lu ei oma soovitud t��pi %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[t�histatud] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[aegunud] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tundmatu"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "mitte kunagi"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "palun tehke --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6169,6 +6228,11 @@ msgstr "Katkesta"
 msgid "no card"
 msgstr "kr�ptimata"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "allkirjastatud andmeid pole\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6228,23 +6292,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "HOIATUS: kasutan ebaturvalist m�lu!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Lisainfot leiate lehelt http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "loe v�tmed failist"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "loe v�tmed failist"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [aegub: %s]"
 
diff --git a/po/fi.po b/po/fi.po
index 7352b1c3a..56ad1046d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -40,71 +40,81 @@ msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "alkulukua, jossa on alle %d bittiä, ei voi luoda\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "entropian keräysmoduulia ei havaittu\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "tiedostoa \"%s\" ei voi avata\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tiedoston \"%s\" tilaa ei voi lukea: %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" on erikoistiedosto - ohitettiin\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "huom: random_seed-tiedosto on tyhjä\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "VAROITUS: random_seed-tiedosto on väärän kokoinen - tiedostoa ei käytetä\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tiedostoon \"%s\" ei voi kirjoittaa: %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROITUS: käytetty satunnaislukugeneraattori ei ole turvallinen.\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -117,7 +127,7 @@ msgstr ""
 "\n"
 "ÄLÄ KÄYTÄ OHJELMAN TUOTTAMAA DATAA!!\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -127,7 +137,7 @@ msgstr ""
 "estäisi sinua pitkästymästä.  Se nimittäin samalla parantaa entropian "
 "laatua.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -166,18 +176,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
@@ -186,11 +196,11 @@ msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -288,22 +298,28 @@ msgstr "Avaimen luonti epäonnistui: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+# Ensimmäinen %s on binary, textmode tai unknown, ks. alla
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -313,72 +329,72 @@ msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 msgid "armor: %s\n"
 msgstr "ascii-koodaus: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "epäkelpo ascii-koodausotsake: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "ascii-koodausotsake: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "epäkelpo selkotekstisen allekirjoituksen otsikko\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "sisäkkäisiä tekstimuotoisia allekirjoituksia\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "odottamaton ascii-koodaus:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -397,13 +413,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Valintasi? "
@@ -582,8 +598,8 @@ msgstr "   (%d) RSA (vain salaus)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -607,7 +623,7 @@ msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
@@ -616,7 +632,7 @@ msgstr "ulos tästä valikosta"
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
@@ -692,7 +708,7 @@ msgstr "ristiriitainen komento\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -737,7 +753,7 @@ msgstr "Toista salasana: "
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -747,14 +763,14 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -796,7 +812,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -815,7 +831,7 @@ msgstr "käytetään salakirjoitusalgoritmia %s\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROITUS: \"%s\" on tyhjä tiedosto\n"
@@ -841,7 +857,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -853,7 +869,7 @@ msgstr "valittu pakkausalgoritmi %s (%d) ei ole vastaanottajan suosima\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
@@ -863,12 +879,12 @@ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
@@ -944,84 +960,77 @@ msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "lue asetukset tiedostosta"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "salaista avainta ei voi käyttää"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1029,128 +1038,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1160,51 +1169,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1213,7 +1222,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1232,16 +1241,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1251,7 +1260,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1259,552 +1268,552 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 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/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1812,28 +1821,28 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1842,29 +1851,34 @@ msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -2248,18 +2262,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "salaista avainta ei voi käyttää"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "lue asetukset tiedostosta"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2384,303 +2394,303 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -2705,52 +2715,52 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2763,63 +2773,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2828,13 +2838,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2843,11 +2853,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2856,55 +2866,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2913,32 +2923,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2947,100 +2957,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3048,11 +3058,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3060,179 +3070,182 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "salaista avainta ei voi käyttää"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3383,112 +3396,112 @@ msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3496,19 +3509,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3516,7 +3529,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3525,55 +3538,55 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3583,179 +3596,179 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 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:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, 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:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, 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:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4112,7 +4125,7 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4274,30 +4287,30 @@ msgstr "ei ihmisten luettavissa"
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4344,367 +4357,400 @@ msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Allekirjoitus täsmää lähettäjään \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -4857,34 +4903,34 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 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:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4895,28 +4941,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4925,17 +4971,17 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
@@ -4986,23 +5032,23 @@ msgstr "Onko tämä oikein (k/E/l)? "
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
@@ -5073,7 +5119,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Valintasi? "
 
@@ -5157,70 +5203,78 @@ msgstr "VAROITUS: Haltija on mitätöinyt tämän aliavaimen!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Huom: Tämä avain on vanhentunut!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Mikään ei takaa sitä, että allekirjoitus todella kuuluu "
 "haltijalleen.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROITUS: Tähän avaimeen EI luoteta!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Allekirjoitus on luultavasti VÄÄRENNÖS.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu tarpeeksi luotettavalla \n"
 "allekirjoituksella!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Ei ole varmaa, että allekirjoitus kuuluu haltijalle.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ohitettu: julkinen avain on jo olemassa\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Et määritellyt käyttäjätunnusta. (voit käyttää valitsinta \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5228,33 +5282,33 @@ msgstr ""
 "\n"
 "Syötä käyttäjätunnus.  Lopeta tyhjällä rivillä: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ohitettu: julkinen avain on jo asetettu oletusvastaanottajaksi\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s ohitettu: julkinen avain on poistettu käytöstä\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
@@ -5294,35 +5348,35 @@ msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "nimetön vastaanottaja; yritän käyttää salaista avainta %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, nimetön vastaanottaja olet sinä.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vanhaa DEK-koodaus ei tueta\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "salausalgoritmi %d%s on tuntematon tai poistettu käytöstä\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "HUOM: salausalgoritmia %d ei löydy valinnoista\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
@@ -5332,65 +5386,65 @@ msgstr "build_packet epäonnistui: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Mitätöinnin tekee:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5410,33 +5464,33 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
@@ -5606,30 +5660,30 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s-allekirjoitus lähettäjältä: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
@@ -5893,125 +5947,129 @@ msgstr "luottamustietue %lu ei ole pyydettyä tyyppiä %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[mitätöity] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[vanhentunut] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tuntematon "
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "ei koskaan"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "tee --check-trustdb, kiitos\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6249,6 +6307,11 @@ msgstr "Peru"
 msgid "no card"
 msgstr "salaamaton"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "ei allekirjoitettua dataa\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6308,23 +6371,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROITUS: käytetään suojaamatonta muistia!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "lisätietoja osoitteesta http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "lue asetukset tiedostosta"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "lue asetukset tiedostosta"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [vanhenee: %s]"
 
diff --git a/po/fr.po b/po/fr.po
index a5d3f7214..74fbbc14a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -29,73 +29,83 @@ msgstr "impossible de g�n�rer un nombre premier avec pbits=%u qbits=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "impossible de g�n�rer un nombre premier avec moins de %d bits\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "impossible de verrouiller `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "�criture de la cl� secr�te dans `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n'est pas un fichier r�gulier - ignor�\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "note: le fichier `random_seed' est vide\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISSEMENT: la taille du fichier `random_seed' est invalide.\n"
 "Celui-ci ne sera pas utilis�.\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossible de lire `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossible d'�crire `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossible de fermer `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION: utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -109,7 +119,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -119,7 +129,7 @@ msgstr ""
 "faire autre chose pour ne pas vous ennuyer, car cela donnera une\n"
 "meilleure qualit� � l'entropie.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -157,12 +167,12 @@ msgstr "la r�ponse ne contient pas le modulo RSA\n"
 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:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
@@ -170,7 +180,7 @@ msgstr ""
 "est %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
@@ -179,11 +189,11 @@ msgstr "la v�rification CHV%d a �chou�: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "l'acc�s aux commandes d'administration n'est pas configur�\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur pendant la r�cup�ration de l'�tat CHV de la carte\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
@@ -280,24 +290,29 @@ msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "signature %s, algorithme de hachage %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "la v�rification du code PIN d'administration est actuellement interdite\n"
 "au travers de cette commande\n"
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -307,70 +322,70 @@ msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
 msgid "armor: %s\n"
 msgstr "armure: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "en-t�te d'armure: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "armure inattendue: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -388,12 +403,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Votre choix ? "
@@ -564,8 +579,8 @@ msgstr "   (2) Cl� de chiffrement\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -585,7 +600,7 @@ msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
@@ -593,7 +608,7 @@ msgstr "quitter ce menu"
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "afficher cette aide"
 
@@ -663,7 +678,7 @@ msgstr "Les commandes d'administration sont permises\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -709,7 +724,7 @@ msgstr "R�p�tez ce code PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -719,14 +734,14 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
@@ -765,7 +780,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
@@ -785,7 +800,7 @@ msgstr "utilisation de l'algorithme de chiffrement %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' d�j� compress�\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISSEMENT: `%s' est un fichier vide\n"
@@ -816,7 +831,7 @@ msgstr ""
 "AVERTISSEMENT: forcer le chiffrement sym�trique %s (%d) entre\n"
 "en d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -832,7 +847,7 @@ msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du destinataire\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
@@ -842,12 +857,12 @@ msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
@@ -927,80 +942,74 @@ msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+#: g10/export.c:65
+#, fuzzy
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "nettoyer les parties inutilisables de la cl�"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1008,127 +1017,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1138,51 +1147,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1190,7 +1199,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1210,17 +1219,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1230,7 +1239,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1238,85 +1247,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1324,21 +1333,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1346,478 +1355,478 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOTE: %s n'est pas disponible dans cette version\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 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/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1825,27 +1834,27 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -1853,30 +1862,35 @@ msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-cl� %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
@@ -2267,15 +2281,12 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "nettoyer les parties inutilisables de la cl�"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2404,304 +2415,304 @@ msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, 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:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
@@ -2725,51 +2736,51 @@ msgstr "ressource bloc de cl�s `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2781,17 +2792,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2801,47 +2812,47 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 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:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" est susceptible d'�tre sign�.  "
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2850,11 +2861,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2863,13 +2874,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2878,43 +2889,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 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:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2922,11 +2933,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2936,31 +2947,31 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2969,92 +2980,92 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La cl� poss�de seulement des items partiels ou stock�s sur carte -\n"
 "pas de phrase de passe � changer.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3063,167 +3074,171 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1445
-msgid "clean unusable parts from key"
-msgstr "nettoyer les parties inutilisables de la cl�"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3367,111 +3382,111 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3479,17 +3494,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3498,7 +3513,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3508,55 +3523,55 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3212
-#, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3566,180 +3581,180 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, 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:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4091,7 +4106,7 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4258,29 +4273,29 @@ msgstr "illisible par un humain"
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "    Empreinte de la cl� ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
@@ -4328,350 +4343,387 @@ msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "recherche de � %s � du serveur %s %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "recherche de � %s � de %s\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, 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:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 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:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, 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:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr ""
+"AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
+"via %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr ""
+"AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
+"via %s: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 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:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Bonne signature de � %s �"
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4679,16 +4731,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -4847,34 +4899,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 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:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4886,27 +4938,27 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez la phrase de passe\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase de passe\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossible de demander la phrase de passe en mode automatique\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Entrez la phrase de passe: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4915,17 +4967,17 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "R�p�tez la phrase de passe: "
 
@@ -4975,23 +5027,23 @@ msgstr "Cette photo est-elle correcte (o/N/q) ? "
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
@@ -5059,7 +5111,7 @@ msgstr ""
 "Le niveau de confiance minimal pour cette cl� est: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
@@ -5138,73 +5190,81 @@ msgstr "ATTENTION: Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Note: cette cl� a �t� d�sactiv�e.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Note: Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION: Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "           Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION: Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "           La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION: Les signatures de cette cl� n'ont pas une confiance suffisante !\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "            Il n'est pas s�r que la signature appartient � son "
 "propri�taire.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignor�: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignor�: cl� publique d�j� pr�sente\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Vous n'avez pas sp�cifi� de nom d'utilisateur. (vous pouvez\n"
 "utiliser �-r�)\n"
 "\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "R�cipients actuels:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5212,33 +5272,33 @@ msgstr ""
 "\n"
 "Entrez le nom d'utilisateur, en terminant par une ligne vide: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Pas d'utilisateur de ce nom.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignor�: la cl� publique est d�j� le destinataire par d�faut\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "La cl� publique est d�sactiv�e.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinataire par d�faut � %s � inconnu\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignor�: la cl� publique est d�sactiv�e\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -5279,37 +5339,37 @@ msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinataire anonyme; essai de la cl� secr�te %s...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "d'accord, nous sommes le destinataire anonyme.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "l'ancien codage de la cl� de chiffrement (DEK) n'est pas support�\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algorithme de chiffrement %d%s est inconnu ou d�sactiv�\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISSEMENT: l'algorithme de chiffrement %s n'a pas �t� trouv�\n"
 "dans les pr�f�rences du destinataire\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTE: la cl� secr�te %s a expir� le %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
@@ -5319,63 +5379,63 @@ msgstr "build_packet a �chou�: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Doit �tre r�voqu� par:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une cl� de r�vocation sensible)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation d�sign�e pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune cl� de r�vocation trouv�e pour � %s �\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te � %s � n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? (o/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5395,33 +5455,33 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? (o/N) "
 
@@ -5600,13 +5660,13 @@ msgstr "Impossible de v�rifier la signature cr��e: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s signature de: � %s �\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5614,17 +5674,17 @@ msgstr ""
 "AVERTISSEMENT: forcer l'algorithme de hachage %s (%d) entre en\n"
 "d�saccord avec les pr�f�rences du destinataire\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
@@ -5892,121 +5952,125 @@ 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:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "utilisation du mod�le de confiance %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "11 le traducteur a bien lu ce qu'il fallait :)"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[ revoqu�e]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[ expir�e ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[ inconnue]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[ind�finie]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[marginale]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[ enti�re ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[  ultime ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "ind�finie"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "jamais"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "marginale"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "enti�re"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "ultime"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr ""
 "v�rification de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr ""
 "mise � jour de la base de confiance inutile avec le mod�le de\n"
 "confiance `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "faites un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, 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:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -6014,7 +6078,7 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6254,6 +6318,11 @@ msgstr "annul�"
 msgid "no card"
 msgstr "pas de carte"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "pas de donn�es sign�es\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "ERREUR: "
@@ -6312,21 +6381,21 @@ msgstr "oO"
 msgid "cC"
 msgstr "aA"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVERTISSEMENT: l'utilisation de la m�moire n'est pas s�re !\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "voir http://www.gnupg.org/fr/faq.html pour plus d'informations\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "l'op�ration n'est pas possible tant que la m�moire s�re n'est pas\n"
 "initialis�e\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
diff --git a/po/gl.po b/po/gl.po
index 5738a2ed6..e8f64a743 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -24,70 +24,80 @@ msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "non se pode xerar un n�mero primo de menos de %d bits\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "non se puido abrir `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "non se puido facer stat sobre `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un ficheiro normal - ign�rase\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "nota: o ficheiro random_seed est� baleiro\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: tama�o do ficheiro random_seed non v�lido - non se emprega\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "non se pode ler de `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "non se pode escribir en `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: ��empr�gase un xerador de n�meros aleatorios inseguro!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +112,7 @@ msgstr ""
 "�NON USE NINGUN DATO XERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -112,7 +122,7 @@ msgstr ""
 "pouco se iso evita que se aburra, que iso ha aumenta-la\n"
 "calidade da entrop�a.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -151,18 +161,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
@@ -171,11 +181,11 @@ msgstr "o env�o ao servidor de chaves fallou: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -273,22 +283,27 @@ msgstr "A xeraci�n da chave fallou: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Sinatura %s, algoritmo de resumo %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -298,72 +313,72 @@ msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "cabeceira de armadura non v�lida: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "cabeceira de armadura: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "cabeceira de sinatura en claro non v�lida\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "sinaturas en texto claro ani�adas\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -381,13 +396,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
@@ -566,8 +581,8 @@ msgstr "   (%d) RSA (s� cifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -591,7 +606,7 @@ msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
@@ -600,7 +615,7 @@ msgstr "sa�r deste men�"
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "amosar esta axuda"
 
@@ -676,7 +691,7 @@ msgstr "comandos conflictivos\n"
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -724,7 +739,7 @@ msgstr "Repita o contrasinal: "
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -734,14 +749,14 @@ msgstr "non se puido abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -784,7 +799,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -803,7 +818,7 @@ msgstr "fallou a sinatura: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � un ficheiro baleiro\n"
@@ -831,7 +846,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,7 +861,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
@@ -856,12 +871,12 @@ msgstr "non se pode empregar %s no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
@@ -936,83 +951,76 @@ msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "le-las opci�ns dun ficheiro"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "chave secreta non utilizable"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1020,128 +1028,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1151,51 +1159,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1203,7 +1211,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1223,17 +1231,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1243,7 +1251,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1251,555 +1259,555 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, 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/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 #, 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/gpg.c:2839
+#: g10/gpg.c:2890
 #, 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 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/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1807,28 +1815,28 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 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/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1837,29 +1845,34 @@ msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
@@ -2234,18 +2247,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "chave secreta non utilizable"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "le-las opci�ns dun ficheiro"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2369,312 +2378,312 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, 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:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, 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:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, 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:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, 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:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, 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:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -2699,51 +2708,51 @@ msgstr "erro ao crear `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2755,63 +2764,63 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2820,11 +2829,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2833,11 +2842,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2846,54 +2855,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2902,32 +2911,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2936,100 +2945,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3037,11 +3046,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3049,183 +3058,186 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "chave secreta non utilizable"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3378,112 +3390,112 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3491,19 +3503,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3511,7 +3523,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3520,57 +3532,57 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "o ID de usuario \"%s\" xa est� revocado\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "o ID de usuario \"%s\" xa est� revocado\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3580,182 +3592,182 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4111,7 +4123,7 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4274,30 +4286,30 @@ msgstr "non lexible por humanos"
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4344,361 +4356,394 @@ msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "buscando \"%s\" no servidor HKP %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "buscando \"%s\" no servidor HKP %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Sinatura correcta de \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -4852,34 +4897,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4890,28 +4935,28 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 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:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4921,17 +4966,17 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
@@ -4981,23 +5026,23 @@ msgstr "�� esta foto correcta (s/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
@@ -5068,7 +5113,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
@@ -5152,68 +5197,76 @@ msgstr "AVISO: �Esta subchave est� revocada polo propietario!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave est� desactivada.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta chave xa caducou!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: �Esta chave non est� certificada cunha sinatura de confianza!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "       Non hai indicaci�ns de que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: �Esta chave NON � de confianza!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       Probablemente, a sinatura estea FALSIFICADA.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta chave non est� certificada con sinaturas de suficiente "
 "confianza!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       Non � seguro que a sinatura pertenza ao seu propietario.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: omitido: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: omitido: a chave p�blica xa est� presente\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non especificou un ID de usuario. (pode empregar \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5221,34 +5274,34 @@ msgstr ""
 "\n"
 "Introduza o ID de usuario. Remate cunha li�a en branco: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "omitido: a chave p�blica xa est� estabrecida coma destinatario por defecto\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desactivada.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: omitido: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "non hai enderezos v�lidos\n"
 
@@ -5287,35 +5340,35 @@ msgstr "non foi posible abri-los datos asinados `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario an�nimo; tentando a chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "vale, n�s somo-lo destinatario an�nimo.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "a codificaci�n vella do DEK non est� soportada\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "o algoritmo de cifrado %d%s � desco�ecido ou est� desactivado\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: o algoritmo de cifrado %d non foi atopado nas preferencias\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
@@ -5325,65 +5378,65 @@ msgstr "a chamada a build_packet fallou: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Ha ser revocada por:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Esta � unha chave de revocaci�n sensible)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Creouse o certificado de revocaci�n.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5401,33 +5454,33 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
@@ -5600,28 +5653,28 @@ msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Sinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
@@ -5888,125 +5941,129 @@ msgstr "o rexistro de confianza %lu non � do tipo %d solicitado\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocada] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[caducada ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "desco�ecido"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "nunca     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, 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:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "por favor, execute con --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6245,6 +6302,11 @@ msgstr "Cancelar"
 msgid "no card"
 msgstr "non cifrado"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "non hai datos asinados\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6304,23 +6366,31 @@ msgstr ""
 msgid "cC"
 msgstr "v"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVISO: ��sase memoria insegura!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "mire en http://www.gnupg.org/faq.html para obter m�is informaci�n\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "le-las opci�ns dun ficheiro"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "le-las opci�ns dun ficheiro"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [caduca: %s]"
 
diff --git a/po/hu.po b/po/hu.po
index 828d4f657..490a4f2ca 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -24,71 +24,81 @@ msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "Nem tudok l�trehozni %d bitesn�l kisebb pr�msz�mot.\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "Nem tudom megnyitni %s-t!\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "Nem tudom a stat m�veletet elv�gezni a(z) \"%s\" �llom�nyon: %s.\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" nem szab�lyos �llom�ny. Figyelmen k�v�l hagyom.\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr ""
 "Megjegyz�s: random_seed �llom�ny (v�letlensz�m-gener�tor �llapota) �res.\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "FIGYELEM: �rv�nytelen m�ret� random_seed �llom�ny. Nem haszn�lom.\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "Nem tudom �rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "Nem tudom bez�rni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "FIGYELEM: Nem biztons�gos v�letlensz�m-gener�tort haszn�lok!!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +112,7 @@ msgstr ""
 "NE HASZN�LJON SEMMILYEN ADATOT, AMIT EZ A PROGRAM EL��LL�T!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -111,7 +121,7 @@ msgstr ""
 "K�rem, v�rjon, entr�pi�t gy�jt�k! Vagy ink�bb csin�ljon k�zben valamit\n"
 "a g�pen, az az entr�pi�m min�s�g�t is jav�tani fogja!\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -150,18 +160,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
@@ -170,11 +180,11 @@ msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -272,22 +282,27 @@ msgstr "Kulcsgener�l�s sikertelen: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -297,72 +312,72 @@ msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 msgid "armor: %s\n"
 msgstr "P�nc�l: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "�rv�nytelen p�nc�lfejl�c: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "P�nc�lfejl�c: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "�rv�nytelen al��r�sfejl�c!\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "Egym�sba �gyazott olvashat�sz�veg-al��r�sok!\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "V�ratlan p�nc�l:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -379,13 +394,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
@@ -564,8 +579,8 @@ msgstr "   (%d) RSA (csak titkos�t�s)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -589,7 +604,7 @@ msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
@@ -598,7 +613,7 @@ msgstr "kil�p�s ebb�l a men�b�l"
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
@@ -674,7 +689,7 @@ msgstr "Egym�snak ellentmond� parancsok!\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -719,7 +734,7 @@ msgstr "Ism�telje meg a jelsz�t: "
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -729,14 +744,14 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
@@ -778,7 +793,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -797,7 +812,7 @@ msgstr "%s rejtjelez�st haszn�lok.\n"
 msgid "`%s' already compressed\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "FIGYELEM: A(z) \"%s\" �llom�ny �res.\n"
@@ -823,7 +838,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -835,7 +850,7 @@ msgstr "A %s (%d) t�m�r�t�s haszn�lata s�rti a c�mzett preferenci�it!\n"
 msgid "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:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
@@ -845,12 +860,12 @@ msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
@@ -926,82 +941,75 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "opci�k beolvas�sa �llom�nyb�l"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "haszn�lhatatlan titkos kulcs"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1009,128 +1017,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1140,51 +1148,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1192,7 +1200,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1212,15 +1220,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1230,7 +1238,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1238,552 +1246,552 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, 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/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1791,28 +1799,28 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 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/gpg.c:4032
+#: g10/gpg.c:4093
 #, 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"
@@ -1821,30 +1829,35 @@ msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, 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"
@@ -2226,18 +2239,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "haszn�lhatatlan titkos kulcs"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "opci�k beolvas�sa �llom�nyb�l"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2361,304 +2370,304 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, 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:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, 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:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, 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:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, 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:1452
+#: g10/import.c:1432
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -2683,51 +2692,51 @@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2740,63 +2749,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2805,11 +2814,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2818,11 +2827,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2831,54 +2840,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2887,32 +2896,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2921,100 +2930,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3022,11 +3031,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3034,179 +3043,182 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "haszn�lhatatlan titkos kulcs"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3357,112 +3369,112 @@ msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3470,19 +3482,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3490,7 +3502,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3500,55 +3512,55 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3558,179 +3570,179 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 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:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 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:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 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:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, 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:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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"
@@ -4085,7 +4097,7 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4247,30 +4259,30 @@ msgstr "nem olvashat� forma"
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4317,364 +4329,399 @@ msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr ""
+"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr ""
+"FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
 "%s-t haszn�lni helyette.\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "J� al��r�s a k�vetkez�t�l: \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -4828,36 +4875,36 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 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:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4869,28 +4916,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4901,17 +4948,17 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
@@ -4961,23 +5008,23 @@ msgstr "Ez a fot� megfelel� (i/N/k)? "
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
@@ -5048,7 +5095,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
@@ -5128,68 +5175,76 @@ msgstr "FIGYELEM: Ezt az alkulcsot a tulajdonosa visszavonta!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Megjegyz�s: Ez a kulcs le lett tiltva.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Megjegyz�s: Ez a kulcs lej�rt!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hiteles�tve megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Semmi jele, hogy ez a kulcs a megadott tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "FIGYELEM: NEM b�zunk ebben a kulcsban!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Az al��r�s val�sz�n�leg HAMIS.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "FIGYELEM: Ez a kulcs nincs igazolva kell�k�ppen megb�zhat� al��r�ssal!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nem biztos, hogy az al��r�s a tulajdonoshoz tartozik.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: kihagyva: nyilv�nos kulcs m�r szerepel\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Nem adott meg felhaszn�l�i azonos�t�t! (Haszn�lhatja a \"-r\" opci�t.)\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5197,34 +5252,34 @@ msgstr ""
 "\n"
 "Adja meg a felhaszn�l�i azonos�t�t! �res sorral fejezze be: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Nincs ilyen felhaszn�l�i azonos�t�.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr ""
 "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva alap�rtelmezett c�mzettnek.\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: Kihagyva: Nyilv�nos kulcs nincs enged�lyezve.\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "Nincsenek �rv�nyes c�mzettek!\n"
 
@@ -5264,35 +5319,35 @@ msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "Anonim c�mzett. A %08lX titkos kulcsot pr�b�lom...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Rendben, mi vagyunk az anonim c�mzett.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "A DEK r�gi k�dol�sa nem t�mogatott.\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "A %d%s rejtjelez� algoritmus ismeretlen vagy tiltott.\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "MEGJEGYZ�S: %d rejtjelez� algoritmus nincs a preferenci�k k�z�tt.\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
@@ -5302,65 +5357,65 @@ msgstr "build_packet sikertelen: %s.\n"
 msgid "key %s has no user IDs\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Visszavonja:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5378,33 +5433,33 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
@@ -5570,12 +5625,12 @@ msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s al��r�s a k�vetkez�t�l: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5583,16 +5638,16 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
@@ -5856,125 +5911,129 @@ msgstr "%lu bizalmi rekord nem a k�rt t�pus� (%d).\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[visszavont] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[lej�rt]     "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "Ismeretlen m�d�"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "soha      "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 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:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, 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:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6212,6 +6271,11 @@ msgstr "M�gsem"
 msgid "no card"
 msgstr "nem titkos�tott"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "Nincs al��rt adat.\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6271,23 +6335,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "FIGYELEM: Nem biztons�gos mem�ri�t haszn�lunk!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Tov�bbi inform�ci� a http://www.gnupg.org/faq.html c�men tal�lhat�.\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "opci�k beolvas�sa �llom�nyb�l"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "opci�k beolvas�sa �llom�nyb�l"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [lej�r: %s]"
 
diff --git a/po/id.po b/po/id.po
index 79cc6833a..8aad54a1b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -26,70 +26,80 @@ msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "tidak dapat membuat bilangan prima dengan bit kurang dari %d\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "modul entropi gathering tidak terdeteksi\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "tidak dapat membuka `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "tidak dapat melakukan statistik `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "'%s' bukan file reguler - diabaikan\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "catatan: file random_seed kosong\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "peringatan: ukuran file random_seed tidak valid - tidak dipakai\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "tidak dapat membaca `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "tidak dapat menulis `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "PERINGATAN: menggunakan random number generator yang tidak aman!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,7 +113,7 @@ msgstr ""
 "JANGAN MENGGUNAKAN DATA YANG DIHASILKAN PROGRAM INI!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +123,7 @@ msgstr ""
 "bila itu tidak akan membosankan anda, karena hal tersebut akan memperbaiki\n"
 "kualitas entropi.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -151,18 +161,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
@@ -171,11 +181,11 @@ msgstr "Pengiriman keyserver gagal: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -273,22 +283,27 @@ msgstr "Pembuatan kunci gagal: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signature, algoritma digest %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -298,72 +313,72 @@ msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 msgid "armor: %s\n"
 msgstr "armor: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "header armor tidak valid: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "header armor: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "header clearsig tidak valid\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "signature teks bersarang\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armor tidak terduga:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -381,13 +396,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Pilihan anda? "
@@ -566,8 +581,8 @@ msgstr "  (%d) RSA (hanya enkripsi)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -591,7 +606,7 @@ msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
@@ -600,7 +615,7 @@ msgstr "berhenti dari menu ini"
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
@@ -676,7 +691,7 @@ msgstr "perintah saling konflik\n"
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -721,7 +736,7 @@ msgstr "Ulangi passphrase: "
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -731,14 +746,14 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -780,7 +795,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -799,7 +814,7 @@ msgstr "menggunakan cipher %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "PERINGATAN: `%s' adalah file kosong\n"
@@ -827,7 +842,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -839,7 +854,7 @@ msgstr "memaksa algoritma kompresi %s (%d) melanggar preferensi penerima\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
@@ -849,12 +864,12 @@ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
@@ -929,83 +944,76 @@ msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "baca pilihan dari file"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "kunci rahasia tidak dapat dipakai"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1013,128 +1021,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1144,51 +1152,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detil"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1196,7 +1204,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1216,15 +1224,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1234,7 +1242,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1242,560 +1250,560 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1803,28 +1811,28 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1833,27 +1841,32 @@ msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -2241,18 +2254,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "kunci rahasia tidak dapat dipakai"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "baca pilihan dari file"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2376,301 +2385,301 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
@@ -2695,51 +2704,51 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2752,63 +2761,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2817,11 +2826,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2830,13 +2839,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2845,43 +2854,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2889,11 +2898,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2903,32 +2912,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2937,100 +2946,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3038,11 +3047,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3050,179 +3059,182 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "kunci rahasia tidak dapat dipakai"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3373,112 +3385,112 @@ msgstr "Perbarui preferensi untuk user ID terpilih?"
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3486,19 +3498,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3506,7 +3518,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3516,55 +3528,55 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "User ID \"%s\" telah dibatalkan\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID \"%s\" telah dibatalkan\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3574,182 +3586,182 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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"
@@ -4101,7 +4113,7 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4263,30 +4275,30 @@ msgstr "tidak dapat dibaca manusia"
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4333,360 +4345,393 @@ msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "mencari \"%s\" dari server HKP %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "mencari \"%s\" dari server HKP %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Signature baik dari \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -4837,34 +4882,34 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4875,28 +4920,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4906,17 +4951,17 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -4968,23 +5013,23 @@ msgstr "Apakah foto ini benar (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
@@ -5055,7 +5100,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
@@ -5136,67 +5181,75 @@ msgstr "PERINGATAN: Subkey ini telah dibatalkan oleh pemiliknya!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Catatan: Kunci ini telah berakhir!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "  Tidak ada indikasi signature milik pemilik.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "PERINGATAN: Kita tidak percaya kunci ini!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "        Signature mungkin palsu.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "PERINGATAN: Kunci tdk disertifikasi dg signature terpercaya yg cukup!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "        Tidak pasti signature milik pemilik.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: dilewati: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: dilewati: kunci publik telah ada\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Anda tidak menspesifikasikan ID user. (anda dapat gunakan \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5204,33 +5257,33 @@ msgstr ""
 "\n"
 "Masukkan user ID.  Akhiri dengan baris kosong: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "dilewati: kunci publik telah diset sebagai penerima baku\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Kunci publik dimatikan.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: dilewati: kunci publik dimatikan\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
@@ -5269,35 +5322,35 @@ msgstr "tidak dapat membuka data tertandai `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "penerima anonim; mencoba kunci rahasia %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "baik, kita adalah penerima anonim.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "encoding lama DEK tidak didukung\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritma cipher %d%s tidak dikenal atau ditiadakan\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "CATATAN: algoritma cipher %d tidak ditemukan dalam preferensi\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
@@ -5307,65 +5360,65 @@ msgstr "build_packet gagal: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Akan dibatalkan oleh:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5385,34 +5438,34 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
@@ -5576,29 +5629,29 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signature dari: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
@@ -5861,125 +5914,129 @@ msgstr "trust record %lu tidak dalam jenis yang diminta %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revoked] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expired] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "tidak dikenal"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "tidak pernah..."
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "lakukanlah --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6217,6 +6274,11 @@ msgstr "Batal"
 msgid "no card"
 msgstr "tidak dienkripsi"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "tidak ada data tertandai\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6276,24 +6338,32 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "Peringatan: menggunakan memori yang tidak aman!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "silakan lihat http://www.gnupg.org/faq.html untuk informasi lebih lanjut\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "baca pilihan dari file"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "baca pilihan dari file"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [berakhir: %s]"
 
diff --git a/po/it.po b/po/it.po
index 186563677..7b741147c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -24,72 +24,82 @@ msgstr "impossibile generare un numero primo di meno di %d bit\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "impossibile generare un numero primo di meno di %d bit\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "impossibile aprire `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "impossibile eseguire stat su `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' non � un file regolare - ignorato\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "nota: il file random_seed � vuoto\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "ATTENZIONE: le dimensioni del file random_seed non sono valide - non usato\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "impossibile leggere `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "impossibile scrivere su `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENZIONE: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -103,7 +113,7 @@ msgstr ""
 "NON USARE ALCUN DATO GENERATO DA QUESTO PROGRAMMA!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +123,7 @@ msgstr ""
 "po',\n"
 "visto che questo migliorer� la qualit� dell'entropia.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -152,18 +162,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
@@ -172,11 +182,11 @@ msgstr "invio al keyserver fallito: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -274,22 +284,27 @@ msgstr "Generazione della chiave fallita: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "Firma %s, algoritmo di digest %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -299,72 +314,72 @@ msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "firme in chiaro annidate\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armatura inaspettata:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -382,13 +397,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Cosa scegli? "
@@ -568,8 +583,8 @@ msgstr "   (%d) RSA (cifra solo)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -593,7 +608,7 @@ msgstr "Parti della chiave segreta non sono disponibili.\n"
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
@@ -602,7 +617,7 @@ msgstr "abbandona questo men�"
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
@@ -678,7 +693,7 @@ msgstr "comandi in conflitto\n"
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -723,7 +738,7 @@ msgstr "Ripeti la passphrase: "
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -733,14 +748,14 @@ msgstr "impossibile aprire `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
@@ -782,7 +797,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -802,7 +817,7 @@ msgstr "uso il cifrario %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ATTENZIONE: `%s' � un file vuoto\n"
@@ -833,7 +848,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -849,7 +864,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
@@ -859,12 +874,12 @@ msgstr "non � possibile usare %s in modalit� %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
@@ -941,82 +956,75 @@ msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "leggi le opzioni dal file"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "chiave segreta inutilizzabile"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1024,128 +1032,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1155,51 +1163,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1207,7 +1215,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1227,15 +1235,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1245,7 +1253,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1253,557 +1261,557 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, 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/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1811,28 +1819,28 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1841,28 +1849,33 @@ msgstr "l'URL della politica di firma indicato non � valido\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -2251,18 +2264,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "chiave segreta inutilizzabile"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "leggi le opzioni dal file"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2386,304 +2395,304 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, 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:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
@@ -2708,51 +2717,51 @@ msgstr "errore creando `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2765,63 +2774,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2830,11 +2839,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2843,11 +2852,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2856,43 +2865,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2900,11 +2909,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2914,32 +2923,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2948,100 +2957,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3049,11 +3058,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3061,179 +3070,182 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "chiave segreta inutilizzabile"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3384,112 +3396,112 @@ msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3498,19 +3510,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3519,7 +3531,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3528,56 +3540,56 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "l'user ID \"%s\" � gi� stato revocato\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "l'user ID \"%s\" � gi� stato revocato\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3587,185 +3599,185 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4120,7 +4132,7 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4283,30 +4295,30 @@ msgstr "non leggibile"
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4353,78 +4365,96 @@ msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "cerco \"%s\" sul server HKP %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "cerco \"%s\" sul server HKP %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4432,283 +4462,298 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Firma valida da \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -4864,34 +4909,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4902,28 +4947,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4933,17 +4978,17 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -4996,23 +5041,23 @@ msgstr "Questa foto � giusta? (s/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
@@ -5083,7 +5128,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
@@ -5166,67 +5211,75 @@ msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: questa chiave � stata disabilitata.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltata: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5234,33 +5287,33 @@ msgstr ""
 "\n"
 "Inserisci l'user ID. Termina con una riga vuota: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "saltata: chiave pubblica gi� impostata come destinatario predefinito\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "La chiave pubblica � disabilitata.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltata: chiave pubblica disabilitata\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -5300,36 +5353,36 @@ msgstr "impossibile aprire i dati firmati `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinatario anonimo; provo la chiave segreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "bene, siamo il destinatario anonimo.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "la vecchia codifica del DEK non � gestita\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "l'algoritmo di cifratura %d%s � sconosciuto o disattivato\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "NOTA: l'algoritmo di cifratura %d non � stato trovato tra le preferenze\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
@@ -5339,65 +5392,65 @@ msgstr "build_packet fallito: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Revocabile da:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Questa � una chiave di revoca sensibile)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5417,33 +5470,33 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
@@ -5624,29 +5677,29 @@ msgstr "controllo della firma creata fallito: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "Firma %s da: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
@@ -5910,125 +5963,129 @@ msgstr "il trust record %lu non � del tipo richiesto %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revocata]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[scaduta]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "sconosciuto"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "mai       "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "per favore usa --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6267,6 +6324,11 @@ msgstr "Cancella"
 msgid "no card"
 msgstr "non cifrato"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "non ci sono dati firmati\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6326,23 +6388,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "ATTENZIONE: si sta usando memoria insicura!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "visitare http://www.gnupg.org/faq.html per ulteriori informazioni\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "leggi le opzioni dal file"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "leggi le opzioni dal file"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr "[scadenza: %s]"
 
diff --git a/po/ja.po b/po/ja.po
index 887aec084..c97efcc49 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -27,70 +27,80 @@ msgstr "pbits=%u qbits=%u���ǿ��������Ǥ��ޤ���\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "%d �ӥå�̤�����ǿ��������Ǥ��ޤ���\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "��%s�פ����å��Ǥ��ޤ���\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "��%s�פ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "��%s�פ����̤Υե�����ǤϤ���ޤ��� - ̵��\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "����: random_seed �ե�����϶��Ǥ�\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "�ٹ�: ̵����Ĺ���� random_seed �ե����� - �Ȥ��ޤ���\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "��%s�פ˽񤭹���ޤ���: %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "��%s�פ��Ĥ����ޤ���: %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "�ٹ�: ���ݤ���������Ҥ��Ȥ��Ƥ��ޤ�!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +114,7 @@ msgstr ""
 "���Υץ����������������ǡ�������ڻȤäƤϤ����ޤ���!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +123,7 @@ msgstr ""
 "�𻨤���������Ƥ��ޤ��Τǡ����Ԥ������������𻨤��μ�������\n"
 "���ޤ��Τǡ��⤷˰�����鲿����Ȥ��Ƥ���������\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -151,18 +161,18 @@ msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
@@ -171,11 +181,11 @@ msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
@@ -270,22 +280,27 @@ msgstr "������������λ���ޤ��� (%d��)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -295,70 +310,70 @@ msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
 msgid "armor: %s\n"
 msgstr "����: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "̵���������إå���: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "�����إå���: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "̵���ʥ��ꥢ��̾�إå���\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "����ҤΥ��ꥢ��̾\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "ͽ����������: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -376,12 +391,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "�����? "
@@ -548,8 +563,8 @@ msgstr "   (2) �Ź沽��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -569,7 +584,7 @@ msgstr "������̩��ʬ��̵���Ǥ�\n"
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
@@ -577,7 +592,7 @@ msgstr "���Υ�˥塼��λ"
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
@@ -645,7 +660,7 @@ msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -692,7 +707,7 @@ msgstr "PIN�������: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -702,14 +717,14 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɽФ����顼: %s\n"
@@ -748,7 +763,7 @@ msgstr "���θ������ˤ���������̩����%s�ɤ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ɥ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -767,7 +782,7 @@ msgstr "%s�Ź�ˡ��Ȥ��ޤ�\n"
 msgid "`%s' already compressed\n"
 msgstr "��%s�פϤ⤦���̺ѤߤǤ�\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "�ٹ�: ��%s�פ϶��Υե�����Ǥ�\n"
@@ -792,7 +807,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: �оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -804,7 +819,7 @@ msgstr "�ٹ�: ���̥��르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ�ˡ %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
@@ -814,12 +829,12 @@ msgstr "%s��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
@@ -892,78 +907,72 @@ msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+#: g10/export.c:65
+#, fuzzy
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "�������"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "���ѤǤ��ʤ���̩���Ǥ�"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -971,127 +980,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1101,55 +1110,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1158,7 +1167,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1178,15 +1187,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1196,7 +1205,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1204,569 +1213,569 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -1774,26 +1783,31 @@ msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
@@ -2175,15 +2189,12 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "���ѤǤ��ʤ���̩���Ǥ�"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2309,296 +2320,296 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -2623,51 +2634,51 @@ msgstr "��%s�פκ������顼: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2678,17 +2689,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2697,46 +2708,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2745,11 +2756,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2758,11 +2769,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2771,53 +2782,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2826,32 +2837,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2860,75 +2871,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2936,11 +2947,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2949,179 +2960,182 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "������"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "��������������URI������"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "���ѤǤ��ʤ���̩���Ǥ�"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3262,109 +3276,109 @@ msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "������������: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3372,17 +3386,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3390,7 +3404,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3399,55 +3413,55 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3456,171 +3470,171 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3967,7 +3981,7 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4123,29 +4137,29 @@ msgstr "�ͤˤ��ɤ�ޤ���"
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "                 ���� ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
@@ -4192,353 +4206,386 @@ msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "��%s�ɤ������������̾"
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -4685,34 +4732,34 @@ msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4723,27 +4770,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "�Хå����⡼�ɤǥѥ��ե졼������礻�Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4752,17 +4799,17 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -4811,23 +4858,23 @@ msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦���ѤǤ�"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
@@ -4892,7 +4939,7 @@ msgid ""
 "\n"
 msgstr "���θ��κǾ����ѥ�٥�: %s\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
@@ -4964,65 +5011,73 @@ msgstr "�ٹ�: ���������Ͻ�ͭ�Ԥˤ�äƼ�������Ƥ��ޤ�!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "����: ���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ���\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "����: ���θ�����λ�Ǥ�!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����θ��ڼ��ʤ�����ޤ���\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "�ٹ�: ���θ��Ͽ��ѤǤ��� ����!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      ���ν�̾�Ϥ����餯 ��ʪ �Ǥ���\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "�ٹ�: ���θ��Ͻ�ʬ�˿��ѤǤ����̾�Ǿ�������Ƥ��ޤ���!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      ���ν�̾����ͭ�ԤΤ�Τ��ɤ����ο��Ǥ��ޤ���\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �����å�: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �����å�: �������Ϥ⤦����ޤ�\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "�桼����ID����ꤷ�Ƥ��ޤ��� (��-r�ɤ�Ȥ��ޤ��礦) ��\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "������:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5030,33 +5085,33 @@ msgstr ""
 "\n"
 "�桼����ID�����ϡ����Ԥǽ�λ: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "���Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "�����å�: �������ϴ���μ���ͤȤ��Ƥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "�������ϻ��ѶػߤǤ���\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "�����å�: �������Ϥ⤦����ѤߤǤ�\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�ɤ����Ĥ���ޤ���\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �����å�: �������ϻ��ѶػߤǤ�\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "ͭ���ʰ��褬����ޤ���\n"
 
@@ -5097,35 +5152,35 @@ msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "ƿ̾�μ�����ѤǤ�����̩��%s���ޤ� ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "��λ��ƿ̾�μ�����ѤǤ���\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "�켰��DEK���ϡ����ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�Ź楢�르�ꥺ��%d%s��̤�Τ����ѶػߤǤ�\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "�ٹ�: �Ź楢�르�ꥺ��%s�ϼ���ͤ����������äƤ��ޤ���\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "����: ��̩��%s��%s����λ�Ǥ�\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
@@ -5135,63 +5190,63 @@ msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "��%s�ˤϥ桼����ID������ޤ���\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "������:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ��������̾�����������������ޤ���? (y/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "��%s���Ѥμ����������Ĥ���ޤ���\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���θ��ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5209,33 +5264,33 @@ msgstr ""
 "�������Ǥ����������������դ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��֤�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? (y/N) "
 
@@ -5383,25 +5438,25 @@ msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s��̾����̾��:��%s��\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
@@ -5659,126 +5714,130 @@ msgstr "���ѥ쥳����%lu���׵ᤵ�줿��%d�ǤϤ���ޤ���\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "̤�Το��ѥ�ǥ� (%d) �ϻȤ��ޤ��� - %s���ѥ�ǥ����\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s���ѥ�ǥ�����\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "����"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "��λ"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "̤�Τ�"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 #, fuzzy
 msgid "[marginal]"
 msgstr "��������"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 #, fuzzy
 msgid "[ultimate]"
 msgstr "����Ū"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "̤���"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "̵����"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "��������"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "����"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "����Ū"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "���ѥ�ǥ��%s�פǿ��ѥǡ����١����ι����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, 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:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6016,6 +6075,11 @@ msgstr "����󥻥�"
 msgid "no card"
 msgstr "�����ɤ�����ޤ���"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "��̾���줿�ǡ���������ޤ���\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "���顼: "
@@ -6074,19 +6138,19 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "�ٹ�: ���ݤʥ��꡼����Ѥ��Ƥ��ޤ�!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤ����Ǥ��ޤ���\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
diff --git a/po/pl.po b/po/pl.po
index 115d43301..647eb25e8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -34,73 +34,83 @@ msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nie mo�na wygenerowa� liczby pierwszej kr�tszej od %d bit�w\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "nie mo�na otworzy� ,,%s''\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nie mo�na sprawdzi� ,,%s'': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ",,%s'' nie jest zwyk�ym plikiem - zostaje pomini�ty\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "uwaga: plik random_seed jest pusty\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "OSTRZE�ENIE: niew�a�ciwy rozmiar pliku random_seed - nie zostanie u�yty\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nie mo�na zapisa� ,,%s'': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nie mo�na zamkn�� ,,%s'': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -114,7 +124,7 @@ msgstr ""
 "JAKIEKOLWIEK DANE GENEROWANE PRZEZ TEN PROGRAM NIE NADAJ� SI� DO \n"
 "NORMALNEGO U�YTKU I NIE ZAPEWNIAJ� BEZPIECZE�STWA!!\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -127,7 +137,7 @@ msgstr ""
 "tworzenia liczb losowych.\n"
 "\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -166,18 +176,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
@@ -186,11 +196,11 @@ msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -288,22 +298,27 @@ msgstr "Generacja klucza nie powiod�a si�: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "podpis %s, skr�t %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
@@ -313,72 +328,72 @@ msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek dokumentu z podpisem na ko�cu\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na ko�cu dokumentu\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64: ,,%02x'', zosta� pomini�ty\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -396,13 +411,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
@@ -583,8 +598,8 @@ msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -608,7 +623,7 @@ msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
@@ -617,7 +632,7 @@ msgstr "wyj�cie z tego menu"
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
@@ -693,7 +708,7 @@ msgstr "sprzeczne polecenia\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -741,7 +756,7 @@ msgstr "Powt�rz has�o: "
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -751,14 +766,14 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
@@ -800,7 +815,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -820,7 +835,7 @@ msgstr "szyfrem %s\n"
 msgid "`%s' already compressed\n"
 msgstr ",,%s'' ju� jest skompresowany\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "OSTRZE�ENIE: plik ,,%s'' jest pusty\n"
@@ -847,7 +862,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -859,7 +874,7 @@ msgstr "wymuszone u�ycie kompresji %s (%d) k��ci si� z ustawieniami adresata\n"
 msgid "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:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
@@ -869,12 +884,12 @@ msgstr "%s nie jest dost�pne w trybie %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
@@ -949,82 +964,75 @@ msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "wczytanie opcji z pliku"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "bezu�yteczny klucz prywatny"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1032,128 +1040,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1163,51 +1171,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1223,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1236,15 +1244,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1254,7 +1262,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1262,73 +1270,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, 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/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1336,21 +1344,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1358,471 +1366,471 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, 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/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1830,28 +1838,28 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1860,28 +1868,33 @@ msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -2258,18 +2271,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "bezu�yteczny klucz prywatny"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "wczytanie opcji z pliku"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2393,305 +2402,305 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, 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:1196
+#: g10/import.c:1176
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, 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:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
@@ -2716,52 +2725,52 @@ msgstr "b��d tworzenia `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2774,63 +2783,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2839,11 +2848,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2852,11 +2861,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2865,56 +2874,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2923,32 +2932,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2957,99 +2966,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3057,11 +3066,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3069,181 +3078,184 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "bezu�yteczny klucz prywatny"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3395,112 +3407,112 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3508,19 +3520,19 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3529,7 +3541,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3538,54 +3550,54 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3595,179 +3607,179 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, 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:4113
+#: g10/keyedit.c:4060
 #, 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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"
@@ -4124,7 +4136,7 @@ msgid ""
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4291,30 +4303,30 @@ msgstr "nieczytelne dla cz�owieka"
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4361,361 +4373,394 @@ msgstr "%lu kluczy (%lu podpis�w)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Poprawny podpis z�o�ony przez \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -4866,34 +4911,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4904,28 +4949,28 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4935,17 +4980,17 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
@@ -4995,23 +5040,23 @@ msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
@@ -5082,7 +5127,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
@@ -5162,69 +5207,77 @@ msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Uwaga: Ten klucz zosta� wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a podpis.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "             Ten podpis prawdopodobnie jest FA�SZYWY.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Tego klucza nie po�wiadczaj� wystarczaj�co zaufane podpisy!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "             Nie ma pewno�ci co do to�samo�ci osoby kt�ra z�o�y�a ten "
 "podpis.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nie zosta� podany identyfikatora u�ytkownika (np za pomoc� ,,-r'')\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5232,33 +5285,33 @@ msgstr ""
 "\n"
 "Identyfikator u�ytkownika (pusta linia oznacza koniec): "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "pomini�ty: klucz publiczny ju� jest domy�lnym adresatem\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Klucz publiczny wy��czony z u�ycia.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: pomini�ty: klucz publiczny wy��czony z u�ytku\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresat�w\n"
 
@@ -5298,35 +5351,35 @@ msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "adresat anonimowy; sprawdzanie %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, to my jeste�my adresatem anonimowym.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algorytm szyfruj�cy %d%s jest nieznany, lub zosta� wy��czony\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "UWAGA: wa�no�� klucza tajnego %08lX wygas�a %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
@@ -5336,65 +5389,65 @@ msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Zostanie uniewa�niony przez:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5418,33 +5471,33 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
@@ -5615,27 +5668,27 @@ msgstr "sprawdzenie z�o�onego podpisu nie powiod�o si�: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis z�o�ony przez: ,,%s''\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
@@ -5900,125 +5953,129 @@ msgstr "wpis zaufania %lu jest typu innego ni� poszukiwany %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[uniewa�niony]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[przeterminowany]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nieznany"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "nigdy     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, fuzzy, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, fuzzy, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "klucz publiczny %08lX nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6256,6 +6313,11 @@ msgstr "Anuluj"
 msgid "no card"
 msgstr "nie zaszyfrowany"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "brak podpisanych danych\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6315,23 +6377,31 @@ msgstr ""
 msgid "cC"
 msgstr "l"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "OSTRZE�ENIE: nie mo�na zabezpieczy� u�ywanej pami�ci!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "obja�nienie mo�na przeczyta� tutaj: http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "wczytanie opcji z pliku"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "wczytanie opcji z pliku"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [wygasa :%s]"
 
diff --git a/po/pt.po b/po/pt.po
index 74b421ca3..d98787992 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -27,71 +27,81 @@ msgstr ""
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "imposs�vel abrir `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel 'stat' a `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' n�o � um ficheiro normal - ignorado\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "nota: random_seed est� vazia\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVISO: o ficheiro random_seed tem um tamanho inv�lido - n�o utilizado\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel ler `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel escrever `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: a utilizar gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -105,14 +115,14 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -150,18 +160,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -170,11 +180,11 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -272,22 +282,27 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "assinatura %s de: \"%s\"\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -297,72 +312,72 @@ msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -380,13 +395,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Op��o? "
@@ -565,8 +580,8 @@ msgstr "   (%d) RSA (apenas cifragem)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -590,7 +605,7 @@ msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -599,7 +614,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -675,7 +690,7 @@ msgstr "comandos em conflito\n"
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -720,7 +735,7 @@ msgstr "Repita a frase secreta: "
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,14 +745,14 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -779,7 +794,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -798,7 +813,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%s' j� comprimido\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um ficheiro vazio\n"
@@ -826,7 +841,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -841,7 +856,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
@@ -851,12 +866,12 @@ msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
@@ -929,82 +944,74 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
+#: g10/export.c:65
+msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
+#: g10/export.c:67
+#, fuzzy
+msgid "remove the passphrase from exported subkeys"
+msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:72
+#: g10/export.c:69
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "ler op��es do ficheiro"
+msgid "remove unusable parts from key during export"
+msgstr "chave secreta n�o utiliz�vel"
 
-#: g10/export.c:75
-msgid "export the smallest key possible"
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:77
-#, fuzzy
-msgid "remove the passphrase from exported subkeys"
-msgstr "revoga uma chave secund�ria"
-
-#: g10/export.c:330
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1012,128 +1019,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1143,55 +1150,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1199,7 +1206,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1219,15 +1226,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1237,7 +1244,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1245,555 +1252,555 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, 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/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 #, 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/gpg.c:2839
+#: g10/gpg.c:2890
 #, 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1801,28 +1808,28 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 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/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1831,27 +1838,32 @@ msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2234,18 +2246,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "chave secreta n�o utiliz�vel"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "ler op��es do ficheiro"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2369,303 +2377,303 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, 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:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2690,51 +2698,51 @@ msgstr "erro ao criar `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2747,63 +2755,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2812,11 +2820,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2825,12 +2833,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2839,55 +2847,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2897,31 +2905,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2930,100 +2938,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3031,11 +3039,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3043,181 +3051,184 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "chave secreta n�o utiliz�vel"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3369,112 +3380,112 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3482,25 +3493,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3509,56 +3520,56 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3567,178 +3578,178 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 #, 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, 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:4113
+#: g10/keyedit.c:4060
 #, 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4096,7 +4107,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4258,30 +4269,30 @@ msgstr "n�o leg�vel por humanos"
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4328,364 +4339,397 @@ msgstr "%lu chave verificadas (%lu assinaturas)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "a procurar por \"%s\" no servidor HKP %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "a procurar por \"%s\" no servidor HKP %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Assinatura correcta de \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -4837,34 +4881,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 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:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4877,28 +4921,28 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4908,17 +4952,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -4965,23 +5009,23 @@ msgstr "Est� correto (s/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
@@ -5052,7 +5096,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Decis�o? "
 
@@ -5136,67 +5180,75 @@ msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "N�o especificou um identificador de utilizador. (pode usar \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5204,33 +5256,33 @@ msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� colocada como destinat�rio por omiss�o\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desactivada\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -5269,35 +5321,35 @@ msgstr "imposs�vel abrir dados assinados `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; a tentar chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de cifra %d%s � desconhecido ou foi desactivado\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de cifragem %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
@@ -5307,68 +5359,68 @@ msgstr "actualiza��o falhou: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5379,37 +5431,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
@@ -5577,11 +5629,11 @@ msgstr "verifica��o da assinatura criada falhou: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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:832
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5589,15 +5641,15 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
@@ -5861,127 +5913,131 @@ msgstr "registo de confian�a %lu n�o � do tipo pedido %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 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:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 #, 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:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6219,6 +6275,11 @@ msgstr "cancelado pelo utilizador\n"
 msgid "no card"
 msgstr "n�o cifrado"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "n�o h� dados assinados\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6279,23 +6340,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVISO: a utilizar mem�ria insegura!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "por favor veja http://www.gnupg.org/faq.html para mais informa��es\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "ler op��es do ficheiro"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "ler op��es do ficheiro"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr "[expira: %s]"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0d36fc49b..077a47211 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -31,71 +31,81 @@ msgstr ""
 msgid "can't generate a prime with less than %d bits\n"
 msgstr ""
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr ""
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "imposs�vel abrir `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "escrevendo certificado privado para `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, fuzzy, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr ""
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr ""
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, fuzzy, c-format
 msgid "can't read `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, fuzzy, c-format
 msgid "can't write `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, fuzzy, c-format
 msgid "can't close `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -109,14 +119,14 @@ msgstr ""
 "N�O USE NENHUM DADO GERADO POR ESTE PROGRAMA!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
 "of the entropy.\n"
 msgstr ""
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -155,18 +165,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -175,11 +185,11 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -277,22 +287,27 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "assinatura %s de: %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -302,72 +317,72 @@ msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "assinaturas em texto puro aninhadas\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "armadura inesperada:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -385,13 +400,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Sua op��o? "
@@ -571,8 +586,8 @@ msgstr "   (%d) ElGamal (apenas criptografia)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -596,7 +611,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -605,7 +620,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -682,7 +697,7 @@ msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -730,7 +745,7 @@ msgstr "Repita a frase secreta: "
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -740,14 +755,14 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -790,7 +805,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -809,7 +824,7 @@ msgstr "assinatura falhou: %s\n"
 msgid "`%s' already compressed\n"
 msgstr "%lu chaves processadas\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
@@ -834,7 +849,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,7 +861,7 @@ msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -856,12 +871,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
@@ -935,82 +950,74 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
+#: g10/export.c:65
+msgid "export revocation keys marked as \"sensitive\""
 msgstr ""
 
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
+#: g10/export.c:67
+#, fuzzy
+msgid "remove the passphrase from exported subkeys"
+msgstr "revoga uma chave secund�ria"
 
-#: g10/export.c:72
+#: g10/export.c:69
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "ler op��es do arquivo"
+msgid "remove unusable parts from key during export"
+msgstr "chave secreta incorreta"
 
-#: g10/export.c:75
-msgid "export the smallest key possible"
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
 msgstr ""
 
-#: g10/export.c:77
-#, fuzzy
-msgid "remove the passphrase from exported subkeys"
-msgstr "revoga uma chave secund�ria"
-
-#: g10/export.c:330
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1018,134 +1025,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1155,61 +1162,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1229,15 +1236,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1247,7 +1254,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1255,561 +1262,561 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 #, 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/gpg.c:2839
+#: g10/gpg.c:2890
 #, 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, 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/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1818,31 +1825,31 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 #, 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/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1851,27 +1858,32 @@ msgstr "a URL de pol�tica dada � inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2200,18 +2212,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "chave secreta incorreta"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "ler op��es do arquivo"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2335,299 +2343,299 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, 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:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, 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:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, 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:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2652,51 +2660,51 @@ msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2715,172 +2723,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2889,90 +2897,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2980,12 +2988,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2993,181 +3001,184 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "chave secreta incorreta"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3319,372 +3330,372 @@ msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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:2992
+#: g10/keyedit.c:2960
 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:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 #, 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:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "A chave � protegida.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "A chave � protegida.\n"
+
+#: g10/keyedit.c:3290
 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:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, 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:4113
+#: g10/keyedit.c:4060
 #, 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 #, 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:4412
+#: g10/keyedit.c:4359
 #, 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:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4045,7 +4056,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4211,34 +4222,34 @@ msgstr ""
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4285,365 +4296,398 @@ msgstr "listar as chaves e as assinaturas"
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "exportar chaves para um servidor"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "lendo op��es de `%s'\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "%s: novo arquivo de op��es criado\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Assinatura correta de \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 #, fuzzy
 msgid "can't handle these multiple signatures\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -4793,34 +4837,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4832,30 +4876,30 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4865,17 +4909,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -4922,25 +4966,25 @@ msgstr "Est� correto (s/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -5013,7 +5057,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
@@ -5094,103 +5138,111 @@ msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "       N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "       A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "       N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 #, fuzzy
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Voc� n�o especificou um identificador de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
 msgstr ""
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "ignorado: chave p�blica j� marcada como destinat�rio padr�o\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "A chave p�blica est� desativada.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 #, fuzzy
 msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: ignorado: a chave p�blica est� desativada\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -5230,36 +5282,36 @@ msgstr "imposs�vel abrir dados assinados `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinat�rio an�nimo; tentando chave secreta %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "certo, n�s somos o destinat�rio an�nimo.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "codifica��o antiga do DEK n�o suportada\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, fuzzy, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 #, fuzzy
 msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
@@ -5269,69 +5321,69 @@ msgstr "atualiza��o falhou: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5342,34 +5394,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
@@ -5527,25 +5579,25 @@ msgstr "leitura de registro de assinatura falhou: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1214
+#: g10/sign.c:1224
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
@@ -5812,127 +5864,131 @@ msgstr "registro de confian�a %lu: remo��o falhou: %s\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "revkey"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "expire"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "vers�o desconhecida"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr ""
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 #, fuzzy
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 #, fuzzy
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6173,6 +6229,11 @@ msgstr ""
 msgid "no card"
 msgstr "n�o criptografado"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "no dados assinados\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6234,24 +6295,32 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 #, fuzzy
 msgid "WARNING: using insecure memory!\n"
 msgstr "Aviso: usando mem�ria insegura!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "a opera��o n�o � poss�vel sem mem�ria segura inicializada\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "ler op��es do arquivo"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "ler op��es do arquivo"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr "A chave expira em %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index 229d3b1fb..9a4caff5b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -28,74 +28,84 @@ msgstr "nu pot genera un num�r prim cu  pbi�i=%u qbi�i=%u\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nu pot genera un num�r prim cu mai pu�in de %d bi�i\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "nu pot �ncuia (lock) `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "scriu cheia secret� �n `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nu pot ob�ine statistici `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nu este un fi�ier normal - ignorat\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "not�: fi�ier random_seed este gol\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr ""
 "AVERTISMENT: dimensiune invalid� pentru fi�ierul random_seed - nu va fi "
 "folosit�\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nu pot citi `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nu pot scrie `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nu pot �nchide `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "AVERISMENT: este folosit un generator de numere aleatoare nesigur "
 "(insecure)!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -109,7 +119,7 @@ msgstr ""
 "NU FOLOSI�I NICI O DAT� GENERAT� DE ACEST PROGRAM!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -118,7 +128,7 @@ msgstr ""
 "V� rug�m a�tepta�i, este adunat� entropia. Face�i ceva dac� v� ajut� s�\n"
 "nu v� plictisi�i, pentru c� va �mbun�t��i calitatea entropiei.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -157,18 +167,18 @@ msgstr "r�spunsul nu con�ine modulul RSA\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
@@ -177,11 +187,11 @@ msgstr "verificarea CHV%d a e�uat: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurat�\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
@@ -274,23 +284,28 @@ msgstr "generarea cheii este complet� (%d secunde)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "semn�tur� %s, algoritm rezumat %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -300,70 +315,70 @@ msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
 msgid "armor: %s\n"
 msgstr "armur�: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "header armur� invalid: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "header armur�: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "header clearsig invalid\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "semn�turi text �n clar �ncuib�rite\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "armur� nea�teptat�: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -381,12 +396,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
@@ -553,8 +568,8 @@ msgstr "   (2) Cheie de cifrare\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
@@ -574,7 +589,7 @@ msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
@@ -582,7 +597,7 @@ msgstr "ie�i din acest meniu"
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
@@ -650,7 +665,7 @@ msgstr "Sunt permise comenzi administrare\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -697,7 +712,7 @@ msgstr "Repeta�i acest PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -707,14 +722,14 @@ msgstr "nu pot deschide `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -755,7 +770,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -774,7 +789,7 @@ msgstr "folosesc cifrul %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "AVERTISMENT: `%s' este un fi�ier gol\n"
@@ -803,7 +818,7 @@ msgstr ""
 "AVERTISMENT: for��nd cifrul simetric %s (%d) viola�i preferin�ele "
 "destinatarului\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -817,7 +832,7 @@ msgstr ""
 msgid "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:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
@@ -827,12 +842,12 @@ msgstr "nu pute�i folosi %s c�t� vreme �n modul %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
@@ -907,79 +922,72 @@ msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "cite�te op�iuni din fi�ier"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "cheie secret� de nefolosit"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -987,127 +995,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1117,51 +1125,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1169,7 +1177,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1189,15 +1197,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1207,7 +1215,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1215,77 +1223,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, 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/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1293,21 +1301,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1315,467 +1323,467 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1783,28 +1791,28 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -1812,26 +1820,31 @@ msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
@@ -2227,18 +2240,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "cheie secret� de nefolosit"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "cite�te op�iuni din fi�ier"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2364,299 +2373,299 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, 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:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
@@ -2680,51 +2689,51 @@ msgstr "resurs� keyblock `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2735,17 +2744,17 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2755,47 +2764,47 @@ msgstr ""
 "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
 "semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 msgid "Sign it? (y/N) "
 msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2804,11 +2813,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2817,12 +2826,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2831,43 +2840,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2875,11 +2884,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2890,31 +2899,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2923,76 +2932,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3000,11 +3009,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3012,162 +3021,165 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "cheie secret� de nefolosit"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3312,109 +3324,109 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3423,17 +3435,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3442,7 +3454,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3451,54 +3463,54 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3212
-#, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3508,174 +3520,174 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 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:4113
+#: g10/keyedit.c:4060
 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 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:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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 %s (uid %d)\n"
@@ -4021,7 +4033,7 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4182,29 +4194,29 @@ msgstr "ilizibil"
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "      Amprent� cheie ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
@@ -4251,358 +4263,391 @@ msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "caut \"%s\" de pe serverul %s %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "caut \"%s\" de pe %s\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Semn�tur� bun� din \"%s\""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -4755,34 +4800,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4794,28 +4839,28 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
 #
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "nu pot cere fraza-parol� �n modul batch\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4824,17 +4869,17 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
@@ -4885,23 +4930,23 @@ msgstr "Este aceast� poz� corect� (d/N/t)? "
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
@@ -4969,7 +5014,7 @@ msgstr ""
 "Nivelul minim de �ncredere pentru aceast� cheie este: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
@@ -5048,69 +5093,77 @@ msgstr "AVERTISMENT: Aceast� cheie a fost revocat� de proprietarul ei!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Not�: Aceast� cheie a fost deactivat�.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Not�: Aceast� cheie a expirat!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� de o semn�tur� de �ncredere!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Nu exist� nici o indica�ie c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVERTISMENT: Noi NU avem �ncredere �n aceast� cheie!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Semn�tura este probabil un FALS.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVERTISMENT: Aceast� cheie nu este certificat� cu suficiente semn�turi de "
 "�ncredere!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nu este sigur c� semn�tura apar�ine proprietarului.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: s�rit�: cheia public� este deja prezent�\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Nu a�i specificat un ID utilizator. (pute�i folosi \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "Destinatari curen�i:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5118,33 +5171,33 @@ msgstr ""
 "\n"
 "Introduce�i ID-ul utilizator.  Termina�i cu o linie nou�: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Nu exist� acest ID utilizator.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "s�rit�: cheia public� setat� deja ca destinatar implicit\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Cheia public� este deactivat�.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: s�rit�: cheia public� este deactivat�\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
@@ -5184,37 +5237,37 @@ msgstr "nu pot deschide date semnate `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "destinator anonim; �ncerc cheia secret� %s ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "OK, noi suntem destinatarul anonim.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "vechea encodare a lui DEK nu este suportat�\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "algoritm cifrare %d%s este necunoscut sau deactivat\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "AVERTISMENT: algoritm cifrare %s nu a fost g�sit �n preferin�ele "
 "destinatarului\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "NOT�: cheia secret� %s a expirat la %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
@@ -5224,63 +5277,63 @@ msgstr "build_packet a e�uat: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Pentru a fi revocat de:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare desemnat pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare g�sit� pentru \"%s\"\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? (d/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5298,33 +5351,33 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? (d/N) "
 
@@ -5490,11 +5543,11 @@ msgstr "verificarea semn�turii create a e�uat: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s semn�tur� de la: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5502,15 +5555,15 @@ msgstr ""
 "AVERTISMENT: for�area algoritmului rezumat %s (%d) violeaz� preferin�ele "
 "destinatarului\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
@@ -5768,123 +5821,127 @@ msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 "nu pot folosi model de �ncredere (%d) - presupun model de �ncredere %s\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "folosesc model de �ncredere %s\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 traduc�tor vezi trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[revocat�]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[expirat�] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[necunoscut�]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[  nedef ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[marginal]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[ deplin�]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[ suprem�]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "nedefinit�"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "niciodat�"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "marginal"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "deplin�"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "suprem�"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "nu e nevoie de o verificare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "nu e nevoie de o actualizare trustdb cu modelul de �ncredere `%s'\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "v� rug�m face�i un --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6121,6 +6178,11 @@ msgstr "anulat�"
 msgid "no card"
 msgstr "nici un card"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "nici o dat� semnat�\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "EROARE: "
@@ -6179,23 +6241,31 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "AVERTISMENT: este folosit� memorie neprotejat� (insecure)!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "vede�i http://www.gnupg.org/faq.html pentru informa�ii suplimentare\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr ""
 "opera�ia nu este posibil� f�r� memorie protejat� (secure) ini�ializat�\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
+#, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "cite�te op�iuni din fi�ier"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "cite�te op�iuni din fi�ier"
+
 #~ msgid "expired: %s)"
 #~ msgstr "expirat: %s)"
 
diff --git a/po/ru.po b/po/ru.po
index 9f834ccd7..0cdfa8e5a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -26,70 +26,80 @@ msgstr "не могу сгенерировать простое число с pb
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "не могу сгенерировать простое число меньше чем с %d битами\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "не найден модуль накопления энтропии\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "невозможно заблокировать `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "сохранение секретного ключа в `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "не могу выполнить stat `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' не регулярный файл - проигнорирован\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "замечание: файл random_seed пуст\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "ВНИМАНИЕ: недопустимый размер файла random_seed - не использую\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "не могу прочитать `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "не могу записать `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "не могу закрыть `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "ВНИМАНИЕ: используется небезопасный генератор случайных чисел!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +114,7 @@ msgstr ""
 "НЕ ПОЛЬЗУЙТЕСЬ ДАННЫМИ СОЗДАННЫМИ ЭТОЙ ВЕРСИЕЙ ПРОГРАММЫ!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -114,7 +124,7 @@ msgstr ""
 "Вы можете выполнять в это время какую-нибудь работу, это спасет от скуки\n"
 "и увеличит качество и скорость сбора случайных данных.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -152,18 +162,18 @@ msgstr "в ответе отсутствует модуль RSA\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
@@ -172,11 +182,11 @@ msgstr "при проверке CHV%d сбой: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
@@ -270,23 +280,28 @@ msgstr "ключ сгенерирован (%d секунд)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s подпись, хэш-функция %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещен этой командой\n"
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -296,70 +311,70 @@ msgstr "нет доступа %s - неработоспособная карта
 msgid "armor: %s\n"
 msgstr "формат ASCII: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "неправильный заголовок ASCII: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "заголовок ASCII: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "неправильный заголовок прозрачной подписи\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "вложенные прозрачные подписи\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "неожиданный формат ASCII:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -377,12 +392,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
@@ -549,8 +564,8 @@ msgstr "   (2) Ключ шифрования\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
@@ -570,7 +585,7 @@ msgstr "секретные части ключа недоступны\n"
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
@@ -578,7 +593,7 @@ msgstr "выйти из этого меню"
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "показать данную справку"
 
@@ -648,7 +663,7 @@ msgstr "Команды администрирования разрешены\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -693,7 +708,7 @@ msgstr "Повторите ввод PIN: "
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -703,14 +718,14 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
@@ -749,7 +764,7 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -768,7 +783,7 @@ msgstr "используемый алгоритм шифрования %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' уже сжат\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "ВНИМАНИЕ: `%s' пустой файл\n"
@@ -794,7 +809,7 @@ msgid ""
 msgstr ""
 "ВНИМАНИЕ: использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -806,7 +821,7 @@ msgstr "ВНИМАНИЕ: сжатие алгоритмом %s (%d) наруша
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) противоречит предпочтениям получателя\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "Вы не можете использовать %s в режиме %s\n"
@@ -816,12 +831,12 @@ msgstr "Вы не можете использовать %s в режиме %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
@@ -894,78 +909,72 @@ msgstr "ВНИМАНИЕ: не могу удалить временный фай
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+#: g10/export.c:65
+#, fuzzy
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "удаление неиспользуемых частей из ключа"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -973,127 +982,127 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1103,51 +1112,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1155,7 +1164,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1175,15 +1184,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1193,7 +1202,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1201,92 +1210,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1294,466 +1303,466 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
 # test it
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1761,27 +1770,27 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания пользователя должно содержать '@' символ\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "имя пользователя не должно содержать более одного символа '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -1789,28 +1798,33 @@ msgstr "заданный URL предпочитаемого сервера кл�
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[User ID не найден]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
@@ -2196,15 +2210,12 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "удаление неиспользуемых частей из ключа"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2334,296 +2345,296 @@ msgstr ""
 "Вы можете обновить список предпочтений используя:\n"
 "\tgpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение ключа исправлено\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
 # test it
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
@@ -2647,51 +2658,51 @@ msgstr ""
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2703,17 +2714,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2724,47 +2735,47 @@ msgstr ""
 "trust signatures on your behalf.\n"
 
 # check it
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\"  подписываем."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2773,11 +2784,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2786,11 +2797,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2799,55 +2810,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2857,31 +2868,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2890,74 +2901,74 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2965,11 +2976,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2977,157 +2988,161 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1445
-msgid "clean unusable parts from key"
-msgstr "удаление неиспользуемых частей из ключа"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3269,110 +3284,110 @@ msgstr "Действительно обновить предпочтения д�
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Опции: "
 
 # check it
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3380,18 +3395,18 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "просрочен с"
 
 # check it
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3399,7 +3414,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3408,54 +3423,54 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы не можете добавить фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3212
-#, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "User ID \"%s\" уже очищен\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "User ID \"%s\" уже очищен\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3464,170 +3479,170 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
 # c-format
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -3972,7 +3987,7 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4132,29 +4147,29 @@ msgstr "нечитаемо для человека"
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "Отпечаток ключа ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4201,356 +4216,389 @@ msgstr "%lu ключей закешированно (%lu подписей)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
 # test it
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "поиск \"%s\" на %s сервере %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "поиск \"%s\" на %s\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
 # test it
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s \n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "пароль создан с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu паролями\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 паролем\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "Расшифровано\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕТЬТЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Действительная подпись от \"%s\""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
@@ -4704,34 +4752,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4742,44 +4790,44 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "Необходим пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
@@ -4828,23 +4876,23 @@ msgstr "Данное фото правильное (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
@@ -4913,7 +4961,7 @@ msgstr ""
 "Минимальный уровень доверия данному ключу: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
@@ -4994,66 +5042,74 @@ msgstr "ВНИМАНИЕ: Данный подключ был отозван ег
 msgid "Note: This key has been disabled.\n"
 msgstr "Замечание: Данный ключ отключен.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Замечание: Данный ключ просрочен!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ВНИМАНИЕ: Данный ключ не заверен доверенной подписью!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Нет указаний на то, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ВНИМАНИЕ: НЕТ ДОВЕРИЯ данному ключу!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Возможно, что подпись ПОДДЕЛАНА.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ВНИМАНИЕ: Этот ключ не заверен достаточным количеством доверяемых подписей!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Нет уверенности в том, что подпись принадлежит владельцу.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: пропущено: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: пропущено: открытый ключ уже существует\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Не задан User ID. (можете использовать \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "Текущие получатели:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5061,33 +5117,33 @@ msgstr ""
 "\n"
 "Введите User ID.  Пустая строка для завершения: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Нет такого User ID.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "пропущено: открытый ключ уже установлен для получателя по умолчанию\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Открытый ключ отключен.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: пропущено: открытый ключ отключен\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "нет действительных адресов\n"
 
@@ -5126,36 +5182,36 @@ msgstr "не могу открыть подписанные данные `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "анонимный получатель; пробую секретный ключ %s ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "Отлично, мы анонимный получатель.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "старое шифрование DEK не поддерживается\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "алгоритм шифрования %d%s неизвестен или отключен\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr ""
 "ВНИМАНИЕ: алгоритм шифрования %s не найден в списке предпочтений получателя\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "ЗАМЕТЬТЕ: секретный ключ %s просрочен с %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr ""
@@ -5165,64 +5221,64 @@ msgstr ""
 msgid "key %s has no user IDs\n"
 msgstr "ключ %s не имеет User ID\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Будет отозван:\n"
 
 # check it
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Это - sensitive ключ отзыва)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr ""
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Сертификат отзыва создан.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва для \"%s\" не найдены\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ \"%s\" не найден: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/N)"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5241,33 +5297,33 @@ msgstr ""
 "носитель будет повреждён, но будьте осторожны: система печати\n"
 "Вашей машины может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Укажите причину отзыва:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? (y/N) "
 
@@ -5429,11 +5485,11 @@ msgstr "сбой проверки созданной подписи: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s подпись от: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5441,15 +5497,15 @@ msgstr ""
 "ВНИМАНИЕ: использование хэш-функции %s (%d) нарушает предпочтения "
 "получателя\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "подпись:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
@@ -5709,117 +5765,121 @@ msgstr ""
 "не могу использовать неизвестную модель (%d) - использую %s модель доверий\n"
 
 # check it
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "использую %s модель доверий\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[ отозван]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[просрочн]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[неизвстн]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[неопредл]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[ограничн]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[ полное ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[абсолютн]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "неопределено"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "никогда"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "ограниченно"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "полное"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "абсолютное"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "нет необходимости проверять таблицу доверий при `%s' модели доверий\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "нет необходимости обновлять таблицу доверий при '%s' модели доверий\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "открытый ключ %s не найден: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "выполните --check-trustdb, пожалуйста\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
 # check it
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5827,7 +5887,7 @@ msgstr ""
 "глубина: %d  корректных: %3d  подписанных: %3d  доверия: %d-, %dq, %dn, %dm, "
 "%df, %du\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6064,6 +6124,11 @@ msgstr "отменено"
 msgid "no card"
 msgstr "нет карты"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "не подписанные данные\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "ОШИБКА:"
@@ -6122,19 +6187,19 @@ msgstr ""
 msgid "cC"
 msgstr ""
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "ВНИМАНИЕ: используется незащищенная память!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Для дополнительной информации см. http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "операция невозможна без инициализации защищенной памяти\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
diff --git a/po/sk.po b/po/sk.po
index 7fcfc01dc..a6bbac515 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -23,70 +23,80 @@ msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "nem��em vytvori� prvo��slo s d�kou menej ako %d bitov\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "nemo�no otvori� `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "nem��em pou�i� pr�kaz stat na `%s': %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' nie je norm�lny s�bor - ignorovan�\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "pozn�mka: s�bor random_seed je pr�zdny\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "varovanie: neplatn� ve�kos� random_seed - s�bor nepou�it�\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "nem��em ��ta� `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "nem��em zapisova� do `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VAROVANIE: pou�it� gener�tor n�hodn�ch ��sel nie je bezpe�n�!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -100,7 +110,7 @@ msgstr ""
 "NEPOU��VAJTE �IADNE D�TA VYTVOREN� T�MTO PROGRAMOM!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -109,7 +119,7 @@ msgstr ""
 "Pros�m �akajte, z�skava sa entropia. Robte zatia� nejak� in� pr�cu\n"
 "aby ste sa nenudili a zv��ite t�m kvalitu entropie.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -147,18 +157,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
@@ -167,11 +177,11 @@ msgstr "nepodarilo posla� k��� na server: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -269,22 +279,27 @@ msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s podpis, hashovac� algoritmus %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -294,72 +309,72 @@ msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 msgid "armor: %s\n"
 msgstr "ASCII k�dovanie: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "neplatn� hlavi�ka ASCII k�dovania: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "ASCII hlavi�ka: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "neplatn� hlavi�ka podpisu v �itate�nom form�te\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "vnoren� podpisy v �itate�nom form�tu\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 msgstr "neo�ak�van� k�dovanie ASCII:"
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -377,13 +392,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "V� v�ber? "
@@ -562,8 +577,8 @@ msgstr "   (%d) RSA (len na �ifrovanie)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -587,7 +602,7 @@ msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
@@ -596,7 +611,7 @@ msgstr "ukon�i� toto menu"
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
@@ -672,7 +687,7 @@ msgstr "konfliktn� pr�kazy\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -717,7 +732,7 @@ msgstr "Opakujte heslo: "
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -727,14 +742,14 @@ msgstr "nemo�no otvori� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
@@ -776,7 +791,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -795,7 +810,7 @@ msgstr "pou�it� �ifra %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VAROVANIE: s�bor `%s' je pr�zdny\n"
@@ -821,7 +836,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -834,7 +849,7 @@ msgstr ""
 msgid "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:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr ""
@@ -846,12 +861,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
@@ -926,82 +941,75 @@ msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "��ta� nastavenia zo s�boru"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "nepou�ite�n� tajn� k���"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, 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:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1009,128 +1017,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1140,55 +1148,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1197,7 +1205,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1217,17 +1225,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1237,7 +1245,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1245,561 +1253,561 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, 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/gpg.c:1252
+#: g10/gpg.c:1259
 #, 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/gpg.c:1255
+#: g10/gpg.c:1262
 #, 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/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 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/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 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/gpg.c:2842
+#: g10/gpg.c:2893
 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/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 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/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1807,28 +1815,28 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1837,29 +1845,34 @@ msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
 # c-format
-#: g10/getkey.c:1731
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, 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"
@@ -2240,18 +2253,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "nepou�ite�n� tajn� k���"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "��ta� nastavenia zo s�boru"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2375,306 +2384,306 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, 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:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, 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:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, 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:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, 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:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, 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:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, 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:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, 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:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, 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:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, 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:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, 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:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, 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:1580
+#: g10/import.c:1560
 #, 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:1597
+#: g10/import.c:1577
 #, 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:1611
+#: g10/import.c:1591
 #, 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:1619
+#: g10/import.c:1599
 #, 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:1719
+#: g10/import.c:1699
 #, 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:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -2699,52 +2708,52 @@ msgstr "chyba pri vytv�ran� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2757,63 +2766,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2822,11 +2831,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2836,11 +2845,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2850,54 +2859,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2907,32 +2916,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2941,28 +2950,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2970,72 +2979,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3043,11 +3052,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3055,179 +3064,182 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "nepou�ite�n� tajn� k���"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3378,112 +3390,112 @@ msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3491,19 +3503,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3511,7 +3523,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3520,55 +3532,55 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3577,176 +3589,176 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, 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:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, 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:3522
+#: g10/keyedit.c:3469
 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:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 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:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, 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:4113
+#: g10/keyedit.c:4060
 #, 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:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4101,7 +4113,7 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4263,30 +4275,30 @@ msgstr "nie je v priamo �itate�nom form�te"
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4333,366 +4345,399 @@ msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
 "vyu�i�\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Dobr� podpis od \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -4844,34 +4889,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4882,28 +4927,28 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 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:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4913,17 +4958,17 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, 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:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -4974,23 +5019,23 @@ msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
@@ -5061,7 +5106,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
@@ -5141,69 +5186,77 @@ msgstr "VAROVANIE: Tento podk��� bol revokovan� jeho vlastn�kom!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Pozn�mka: Tento k��� bol ozna�en� ako neplatn� (disabled).\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Pozn�mka: Skon�ila platnos� tohto k���a!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VAROVANIE: Tento k��� nie certifikovan� d�veryhodn�m podpisom!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Ni� nenazna�uje tomu, �e tento podpis patr� vlastn�kovi k���a.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VAROVANIE: NEd�verujeme tomuto k���u!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Tento podpis je pravdepodobne FALO�N�.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VAROVANIE: Tento k��� nie je certifikovan� dostato�ne d�veryhodn�mi "
 "podpismi!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Nie je ist�, �e tento podpis patr� vlastn�kovi.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: presko�en�: verejn� k��� je u� obsiahnut� v datab�ze\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Ne�pecifikovali ste identifik�tor u��vate�a (user ID). M��ete pou�i� \"-r\"\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5211,33 +5264,33 @@ msgstr ""
 "\n"
 "Nap��te identifik�tor u��vate�a (user ID). Ukon�ite pr�zdnym riadkom: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Tak�to identifik�tor u��vate�a neexistuje.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven� pod�a implicitn�ho adres�ta\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Verejn� k��� je neplatn� (disabled).\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: presko�en�: verejn� k��� je neplatn� (disabled)\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "�iadne platn� adresy\n"
 
@@ -5276,35 +5329,35 @@ msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonymn� adres�t; sk��am tajn� k��� %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "o.k., my sme anonymn� adres�t.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "star� k�dovanie DEK nie je podporov�n�\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "�ifrovac� algoritmus %d%s je neznam� alebo je zak�zan�\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "POZN�MKA: v predvo�b�ch nen�jden� �ifrovac� algoritmus %d\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "POZN�MKA: platnos� tajn�ho k���a %08lX skon�ila %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
@@ -5314,65 +5367,65 @@ msgstr "build_packet zlyhala: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Bude revokovan�:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� k���)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5390,33 +5443,33 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
@@ -5581,29 +5634,29 @@ msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s podpis od: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, 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:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
@@ -5869,125 +5922,129 @@ msgstr "z�znam d�very %lu nie je po�adovan�ho typu %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[revokovan�]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[expirovan�]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "nezn�me"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "nikdy     "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "pros�m vykonajte --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, 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:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, 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"
@@ -6225,6 +6282,11 @@ msgstr "Zru�i�"
 msgid "no card"
 msgstr "neza�ifrovan�"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "ch�baj� podp�san� d�ta\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6284,23 +6346,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "VAROVANIE: Pou��van� pam� nie je bezpe�n�!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "Viac inform�ci� n�jdete na adrese http://www.gnupg.org/faq.html\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "��ta� nastavenia zo s�boru"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "��ta� nastavenia zo s�boru"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr " [platnos� skon��: %s]"
 
diff --git a/po/sv.po b/po/sv.po
index 217e579d9..0b0870cfb 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -41,70 +41,81 @@ msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "kan inte skapa ett primtal med mindre än %d bitar\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "ingen demon för entropisamling hittad\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+# se förra kommentaren
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "kan inte öppna \"%s\"\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "skriver hemlig nyckel till \"%s\"\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "kan inte ta status på \"%s\": %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "\"%s\" är inte än vanlig fil - ignorerad\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "Obs: filen random_seed är tom\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 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"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "kan inte läsa \"%s\": %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "kan inte skriva till \"%s\": %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "kan inte stänga \"%s\": %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "VARNING: använder en osäker slumptalsgenerator!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -119,7 +130,7 @@ msgstr ""
 "ANVÄND INGEN DATA GENERERAD AV DETTA PROGRAM!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -129,7 +140,7 @@ msgstr ""
 "det hindra dig att bli uttråkad, eftersom det förbättrar kvaliteten\n"
 "på entropin.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -168,18 +179,18 @@ msgstr ""
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
@@ -188,11 +199,11 @@ msgstr "Sändning till nyckelservern misslyckades: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -290,22 +301,27 @@ msgstr "Nyckelgenereringen misslyckades: %s\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s signatur, sammandragsalgoritm %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -315,75 +331,75 @@ msgstr ""
 msgid "armor: %s\n"
 msgstr "ASCII-skal: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "felaktig rubrikrad i ASCII-skalet: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "rad i ASCII-skalet: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "felaktig rubrikrad i klartextsignatur\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "flera klartextsignaturer går in i varandra\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 #, fuzzy
 msgid "unexpected armor: "
 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:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "felaktig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\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:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "felaktigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -402,13 +418,13 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 #, 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:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Vad väljer du? "
@@ -586,8 +602,8 @@ msgstr "   (%d) RSA (endast kryptering)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -611,7 +627,7 @@ msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
@@ -620,7 +636,7 @@ msgstr "avsluta denna meny"
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "visa denna hjälp"
 
@@ -695,7 +711,7 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
@@ -741,7 +757,7 @@ msgid "PIN not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -751,14 +767,14 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsning av nyckelblock: %s\n"
@@ -800,7 +816,7 @@ msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
@@ -819,7 +835,7 @@ msgstr "använderchiffer %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' är redan komprimerad\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "VARNING: \"%s\" är en tom fil\n"
@@ -848,7 +864,7 @@ msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -864,7 +880,7 @@ msgstr ""
 "att genomdriva symmetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
@@ -874,12 +890,12 @@ msgstr "du kan inte använda %s när du är i %s läge\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
@@ -956,7 +972,7 @@ msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr ""
@@ -964,77 +980,70 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "läs inställningar från fil"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "hittade inga spärrnycklar till `%s'\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "oanvändbar hemlig nyckel"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, 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:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr ""
 "nyckel %08lX: signatur på undernyckel på fel plats - hoppade över "
 "signaturen\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -1042,130 +1051,130 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "visa en lista på nycklar och signaturer"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 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/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1175,53 +1184,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1229,7 +1238,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1249,18 +1258,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera gärna fel till <[email protected]>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1270,7 +1279,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1278,566 +1287,566 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, 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/gpg.c:1264
+#: g10/gpg.c:1271
 #, 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/gpg.c:1267
+#: g10/gpg.c:1274
 #, 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/gpg.c:1273
+#: g10/gpg.c:1280
 #, 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/gpg.c:1276
+#: g10/gpg.c:1283
 #, 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/gpg.c:1279
+#: g10/gpg.c:1286
 #, 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/gpg.c:1420
+#: g10/gpg.c:1427
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "visa vilken nyckelring den listade nyckeln hör till"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, 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/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, 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/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 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/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "felaktiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, 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/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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/gpg.c:2960
+#: g10/gpg.c:3011
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, 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/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, 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/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1848,31 +1857,31 @@ msgstr ""
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 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/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -1881,29 +1890,34 @@ msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, 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:2283
+#: g10/getkey.c:2323
 #, 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:2514
+#: g10/getkey.c:2554
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, 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"
@@ -2301,18 +2315,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "oanvändbar hemlig nyckel"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "läs inställningar från fil"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2436,266 +2446,266 @@ msgstr ""
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:756
+#: g10/import.c:741
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:771
+#: g10/import.c:756
 #, 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:777
+#: g10/import.c:762
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, 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:834
+#: g10/import.c:817
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, 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:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, 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:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, 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:923
+#: g10/import.c:903
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, 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:929
+#: g10/import.c:909
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, 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:1129
+#: g10/import.c:1109
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, 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:1226
+#: g10/import.c:1206
 #, 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:1269
+#: g10/import.c:1249
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, 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:1382
+#: g10/import.c:1362
 #, 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:1384
+#: g10/import.c:1364
 #, 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:1402
+#: g10/import.c:1382
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, 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:1415
+#: g10/import.c:1395
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, 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:1465
+#: g10/import.c:1445
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
@@ -2703,49 +2713,49 @@ msgstr ""
 "signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, 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:1795
+#: g10/import.c:1775
 #, 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:1854
+#: g10/import.c:1834
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
@@ -2770,51 +2780,51 @@ msgstr "Fel vid skapande av `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2828,63 +2838,63 @@ msgstr ""
 "källor...)?\n"
 "\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt på denna användare\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt på denna användare\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
 "trust signatures on your behalf.\n"
 msgstr ""
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för nvändar-ID \"%s\" har gått ut.."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2893,11 +2903,11 @@ msgstr ""
 "Egensignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Will du göra om den till en egensignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2906,13 +2916,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2921,44 +2931,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2966,11 +2976,11 @@ msgstr ""
 "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
 "läge\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2979,33 +2989,33 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 "     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "     (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -3014,14 +3024,14 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -3029,7 +3039,7 @@ msgstr ""
 "VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -3037,7 +3047,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -3045,7 +3055,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -3053,65 +3063,65 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -3119,11 +3129,11 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -3131,182 +3141,185 @@ msgstr ""
 "Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "visa en lista på nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 #, fuzzy
 msgid "select subkey N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 #, fuzzy
 msgid "check signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 #, fuzzy
 msgid "enable key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "disable key"
 msgstr "stäng av en nyckel"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "visa foto-ID"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "oanvändbar hemlig nyckel"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, fuzzy, c-format
@@ -3458,113 +3471,113 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, 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:2697
+#: g10/keyedit.c:2665
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3572,19 +3585,19 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3593,7 +3606,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3603,56 +3616,56 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 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:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett fofo-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 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:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "Användar-ID \"%s\" är redan spärrad\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "felaktigt skal"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "Användar-ID \"%s\" är redan spärrad\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3661,33 +3674,33 @@ msgstr ""
 "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna "
 "nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3695,152 +3708,152 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, 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:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, 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:4465
+#: g10/keyedit.c:4412
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, 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"
@@ -4198,7 +4211,7 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4361,30 +4374,30 @@ msgstr "inte möjlig att läsa för människor"
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "    Undernyckelns fingeravtryck:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "     Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -4432,370 +4445,403 @@ msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "söker \"%s\" från HKP-server %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "söker \"%s\" från HKP-server %s\n"
+
+#: g10/keyserver.c:1271
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s  krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenmening skapad  med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "den öppna nyckeln är %08lX\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat till öppen nyckel: Giltig DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "öppen nyckel-dekryptering misslyckades: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenmeningar\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenmening\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
 "istället\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 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:589
+#: g10/mainproc.c:593
 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:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "Korrekt signatur från \""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Giltighetstiden har upphört för signatur från \""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, fuzzy, c-format
 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:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -4945,34 +4991,34 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4983,28 +5029,28 @@ msgstr ""
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 #, fuzzy
 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:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Ange lösenmening: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5014,17 +5060,17 @@ msgstr ""
 "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
@@ -5075,25 +5121,25 @@ msgstr "Är detta foto korrekt (j/N/a)? "
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra. Betyder att nyckeln inte används längre, utan användaren har skapat en ny nyckel som ersätter den gamla.
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
@@ -5167,7 +5213,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
@@ -5248,70 +5294,78 @@ msgstr "VARNING: Denna undernyckel har spärrats av sin ägare!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "Obs: Denna nyckel har stängts av.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Obs: Giltighetstiden för denna nyckel har gått ut!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Det finns inget som indikerar att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "VARNING: Vi litar INTE på denna nyckel!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Signaturen är sannolikt en FÖRFALSKNING.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "VARNING: Denna nyckel är inte certifierad med signaturer med ett\n"
 "tillräckligt högt tillitsvärde!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Det är inte säkert att signaturen tillhör ägaren.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: hoppade över: %s\n"
 
 # överhoppad?
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "hoppade över %s: öppen nyckel finns redan\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr ""
 "Du specificerade ingen användaridentitet. (du kan använda \"-r\") för detta\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr ""
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5319,28 +5373,28 @@ msgstr ""
 "\n"
 "Skriv användar-ID.  Avsluta med en tom rad: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Hittade inte användaridentiteten.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "hoppade över: den öppna nyckeln är redan satt som förvald mottagare\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Den öppna nyckeln är avstängd.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "hoppade över: öppen nyckel redan angiven\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, fuzzy, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "hoppade över %s: den öppna nyckeln är avstängd\n"
@@ -5348,7 +5402,7 @@ 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:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
@@ -5388,36 +5442,36 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonym mottagare; försöker med den hemliga nyckeln %08lX ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "ok, vi är den hemliga mottagaren.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "gammal kodning av krypteringsnyckeln stöds inte\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "krypteringsalgoritmen %d%s är okänd eller avstängd\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, fuzzy, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "OBS: krypteringsalgoritmen %d finns inte i inställningarna\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, fuzzy, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "OBS: den hemliga nyckeln %08lX gick ut %s\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "OBS: nyckeln har spärrats"
 
 # Vad?
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
@@ -5427,15 +5481,15 @@ msgstr "build_packet misslyckades: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Att spärras av:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
@@ -5445,53 +5499,53 @@ msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 # -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:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal genomdrivet.\n"
 
 # Vad menas???
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, fuzzy, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "hittade inga spärrnycklar till `%s'\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, fuzzy, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "den hemliga nyckeln `%s' hittades inte: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5509,33 +5563,33 @@ msgstr ""
 "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:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ange en beskrivning (frivilligt); avsluta med en tom rad:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning till spärren: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK?"
@@ -5716,13 +5770,13 @@ msgstr "försök att verifiera den skapade signaturen misslyckades: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s signatur från: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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"
 "när du är i --pgp2-läge\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5730,17 +5784,17 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "signerar:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
@@ -6009,129 +6063,133 @@ msgstr "tillitsvärdet %lu är inte av begärd typ %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 #, fuzzy
 msgid "[ revoked]"
 msgstr "[spärrad]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 #, fuzzy
 msgid "[ expired]"
 msgstr "[Giltighetstiden har gått ut]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 #, fuzzy
 msgid "[ unknown]"
 msgstr "okänd"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr ""
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr ""
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr ""
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr ""
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr ""
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 #, fuzzy
 msgid "never"
 msgstr "aldrig"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr ""
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr ""
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr ""
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, 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:592
+#: g10/trustdb.c:597
 #, 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:607
+#: g10/trustdb.c:612
 #, 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:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, fuzzy, c-format
 msgid "public key %s not found: %s\n"
 msgstr "hittade inte den öppna nyckeln %08lX :%s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 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:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, 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:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -6370,6 +6428,11 @@ msgstr "Avbryt"
 msgid "no card"
 msgstr "inte krypterad"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "ingen signerad data\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr ""
@@ -6429,23 +6492,31 @@ msgstr ""
 msgid "cC"
 msgstr "c"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "Varning: använder osäkert minne!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "se http://www.gnupg.org/faq.html för mer information\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 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"
 
 #, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "läs inställningar från fil"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "läs inställningar från fil"
+
+#, fuzzy
 #~ msgid "expired: %s)"
 #~ msgstr "[går ut: %s]"
 
diff --git a/po/tr.po b/po/tr.po
index 7528b5003..aa7411291 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -25,70 +25,80 @@ msgstr "pbits=%u qbits=%u ile bir asal sayı üretilemez\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "%d bitten daha küçük bir asal sayı ürtilemez\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "`%s' kiltlenemedi\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "gizli anahtarı `%s'e yazıyor\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "`%s' durumlanamıyor: %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' düzenli bir dosya değil - görülmedi\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "not: \"random_seed\" dosyası boş\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "UYARI: random_seed dosyasının boyu hatalı - kullanılmadı\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "\"%s\" okunamıyor: %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "\"%s\" yazılamıyor: %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "\"%s\" kapatılamıyor: %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "UYARI: kullanılan rasgele sayı üreteci güvenli değil!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -102,7 +112,7 @@ msgstr ""
 "BU PROGRAMLA ÜRETİLMİŞ HİÇBİR VERİYİ KULLANMAYIN!!\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -111,7 +121,7 @@ msgstr ""
 "Lütfen bekleyin rasgele baytlar toplanıyor. Bu işlem sırasında başka\n"
 "işlere bakın, çünkü bu anahtarınızın daha kaliteli olmasını sağlayacak.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -150,18 +160,18 @@ msgstr "yanıt RSA modülü içermiyor\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
@@ -170,11 +180,11 @@ msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
@@ -268,22 +278,27 @@ msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s imzası, %s özümleme algoritması\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [yapılan imza: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -293,70 +308,70 @@ msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
 msgid "armor: %s\n"
 msgstr "zırh: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "zırh başlığı geçersiz: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "zırh başlığı: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "açıkça okunabilen imza başlığı geçersiz\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "açıkça okunabilen imzalar dahil edildi\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "beklenmeyen zırh: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -374,12 +389,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "Seçiminiz? "
@@ -546,8 +561,8 @@ msgstr "   (2) Şifreleme anahtarı\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -567,7 +582,7 @@ msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
@@ -575,7 +590,7 @@ msgstr "bu menüden çık"
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "bunu gösterir"
 
@@ -643,7 +658,7 @@ msgstr "Yönetici komutlarına izin verilir\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -690,7 +705,7 @@ msgstr "Bu PIN'i tekrarlayın: "
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -700,14 +715,14 @@ msgstr "`%s' açılamadı\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
@@ -746,7 +761,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -765,7 +780,7 @@ msgstr "%s şifrelemesi kullanılıyor\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' zaten sıkıştırılmış\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "UYARI: \"%s\" dosyası boş\n"
@@ -794,7 +809,7 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı "
 "zorlanıyor\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -809,7 +824,7 @@ msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
@@ -819,12 +834,12 @@ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
@@ -897,79 +912,72 @@ msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
+#: g10/export.c:65
 #, fuzzy
-msgid "all export-clean-* options from above"
-msgstr "seçenekleri dosyadan okur"
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "gizli anahtar kullanımdışı"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -977,127 +985,127 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1107,51 +1115,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1159,7 +1167,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1179,17 +1187,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1199,7 +1207,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1207,542 +1215,542 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, 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/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 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/gpg.c:2718
+#: g10/gpg.c:2769
 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/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 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/gpg.c:2837
+#: g10/gpg.c:2888
 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/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, 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ılamaz\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, 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ılamaz\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, 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/gpg.c:3067
+#: g10/gpg.c:3118
 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/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1750,28 +1758,28 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -1779,28 +1787,33 @@ msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
@@ -2178,18 +2191,14 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "gizli anahtar kullanımdışı"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
-#: g10/import.c:109
-#, fuzzy
-msgid "all import-clean-* options from above"
-msgstr "seçenekleri dosyadan okur"
-
 #: g10/import.c:262
 #, c-format
 msgid "skipping block of type %d\n"
@@ -2317,304 +2326,304 @@ msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 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:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
@@ -2638,51 +2647,51 @@ msgstr "`%s' oluşturulurken hata: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2693,17 +2702,17 @@ msgstr ""
 "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
 "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2713,46 +2722,46 @@ msgstr ""
 "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
 "güvence imzaları yapmayı mümkün kılar.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2761,11 +2770,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2774,12 +2783,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2788,44 +2797,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2833,11 +2842,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2846,31 +2855,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2880,76 +2889,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2957,13 +2966,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2971,164 +2980,167 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "gizli anahtar kullanımdışı"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3282,112 +3294,112 @@ msgstr ""
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 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:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3395,17 +3407,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3414,7 +3426,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3423,55 +3435,55 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 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:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3481,182 +3493,182 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 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:3376
+#: g10/keyedit.c:3321
 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:3399
+#: g10/keyedit.c:3346
 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:3414
+#: g10/keyedit.c:3361
 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:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 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:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 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:3581
+#: g10/keyedit.c:3528
 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:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, 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:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 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:4412
+#: g10/keyedit.c:4359
 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:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 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:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, 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:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4005,7 +4017,7 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4166,29 +4178,29 @@ msgstr "insan okuyabilir değil"
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmakizi ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
@@ -4235,356 +4247,389 @@ msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "\"%s\" deki imza iyi"
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -4735,34 +4780,34 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, 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:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4773,27 +4818,27 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "betik kipinde parola sorgulanamaz\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4802,17 +4847,17 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
@@ -4861,23 +4906,23 @@ msgstr "Bu foto doğru mu? (e/H/ç)? "
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
@@ -4944,7 +4989,7 @@ msgstr ""
 "Bu anahtar için asgari güvence seviyesi: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "Kararınız? "
 
@@ -5025,67 +5070,75 @@ msgstr ""
 msgid "Note: This key has been disabled.\n"
 msgstr "Bilgi: Bu anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "Bilgi: Bu anahtarın kullanım süresi dolmuştu!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğuna dair bir belirti yok.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "UYARI: Bu anahtara güven-mi-yoruz!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Bu imza SAHTE olabilir.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "UYARI: Bu anahtar yeterli güven derecesine sahip imzalarla "
 "sertifikalanmamış!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Bu imzanın sahibine ait olduğu kesin değil.\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: atlandı: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: atlandı: genel anahtar zaten var\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "Bir kullanıcı kimliği belirtmediniz. (\"-r\" kullanabilirsiniz)\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "Şimdiki alıcılar:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -5093,33 +5146,33 @@ msgstr ""
 "\n"
 "Kullanıcı kimliğini girin. Boş bir satır işlemi sonlandırır:"
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "atlandı: genel anahtar zaten öntanımlı alıcı olarak ayarlanmış\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "Genel anahtar iptal edildi.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "öntanımlı alıcı \"%s\" bilinmiyor\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: atlandı: genel anahtar iptal edildi\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "geçerli adresler yok\n"
 
@@ -5158,35 +5211,35 @@ msgstr "imzalı veri '%s'  açılamadı\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "anonim alıcı: %s gizli anahtarı deneniyor ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "tamam, biz anonim alıcıyız.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "DEK'in eski kodlaması desteklenmiyor\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "şifre algoritması %d%s bilinmiyor ya da iptal edilmiş\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "UYARI: %s şifre algoritması alıcı tercihlerinde yok\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "BİLGİ: %s gizli anahtarının %s tarihinde kullanım süresi doldu\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
@@ -5196,67 +5249,67 @@ msgstr "build_packet başarısız: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "Yürürlükten kaldıran:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H ya "
 "da y/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "\"%s\" için yürürlükten kaldırma anahtarları yok\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar \"%s\" yok: %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 "Bu anahtar için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H "
 "ya da y/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5274,34 +5327,34 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? (e/H ya da y/N) "
 
@@ -5469,12 +5522,12 @@ msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s imza: \"%s\" den\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5482,17 +5535,17 @@ msgstr ""
 "UYARI: alıcının tercihleriyle çelişen %s (%d) özümleme algoritması "
 "kullanılmak isteniyor\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
@@ -5750,115 +5803,119 @@ msgstr ""
 "bilinmeyen güvence modeli (%d) kullanılamıyor - %s güvence modeli "
 "varsayılıyor\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "%s güvence modeli kullanılıyor\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr ""
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[süresi doldu] "
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[bilinmeyen]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[tanımsız]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[şöyle böyle]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[tamamen]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[son derece]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "tanımsız"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "asla    "
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "şöyle böyle"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "tamamen"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "son derece"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı sınaması için gereksiz\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "`%s' güvence modelli güvence veritabanı güncellemesi için gereksiz\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "genel anahtar %s yok: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "lütfen bir --check-trustdb yapın\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5866,7 +5923,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6103,6 +6160,11 @@ msgstr "iptal edildi"
 msgid "no card"
 msgstr "kat yok"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "imzalı veri yok\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "HATA: "
@@ -6161,24 +6223,32 @@ msgstr "tT"
 msgid "cC"
 msgstr "iİ"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "UYARI: kullanılan bellek güvenli değil!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr ""
 "Daha geniş bilgi edinmek için http://www.gnupg.org/faq.html adresine "
 "bakınız\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
+#, fuzzy
+#~ msgid "all export-clean-* options from above"
+#~ msgstr "seçenekleri dosyadan okur"
+
+#, fuzzy
+#~ msgid "all import-clean-* options from above"
+#~ msgstr "seçenekleri dosyadan okur"
+
 #~ msgid "expired: %s)"
 #~ msgstr "[son kullanma tarihi: %s]"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ac7f73ec1..4bc14e930 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-03-17 22:24+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -29,70 +29,80 @@ msgstr "当 pbits=%u 而 qbits=%u 时不能生成质数\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "少于 %d 位时不能生成质数\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "检测不到熵搜集模块\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "无法锁定‘%s’\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "正在将私钥写至`%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "无法获得文件‘%s’的信息： %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "‘%s’不是一个普通文件――已忽略\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "注意：随机数种子文件为空\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告：随机数种子文件大小无效――未使用\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "无法读取‘%s’：%s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "无法写入‘%s’：%s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "无法关闭‘%s’：%s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告：正在使用不安全的随机数发生器！！\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -106,7 +116,7 @@ msgstr ""
 "绝对不要在现实世界中使用这个程序产生的任何数据！！\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -115,7 +125,7 @@ msgstr ""
 "请稍待片刻，系统此时正在搜集熵。如果您觉得无聊的话，不妨做些\n"
 "别的事——事实上这甚至能够让熵数的品质更好。\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -153,18 +163,18 @@ msgstr "响应未包含 RSA 余数\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
@@ -173,11 +183,11 @@ msgstr "验证 CHV%d 失败：%s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
@@ -270,22 +280,27 @@ msgstr "密钥已生成(耗时 %d 秒)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s 签字，散列算法 %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签字：%lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, fuzzy, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [完成签字：%lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -295,70 +310,70 @@ msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
 msgid "armor: %s\n"
 msgstr "ASCII 封装：%s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "无效的 ASCII 封装头："
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "ASCII 封装头："
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "无效的明文签字头\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "多层明文签字\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "与预期不符的 ASCII 封装："
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -374,12 +389,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "您的选择？ "
@@ -546,8 +561,8 @@ msgstr "  (2) 加密密钥\n"
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
@@ -567,7 +582,7 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -575,7 +590,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -643,7 +658,7 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -688,7 +703,7 @@ msgstr "再次输入此 PIN："
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -698,14 +713,14 @@ msgstr "无法打开‘%s’\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥区块时发生错误：%s\n"
@@ -744,7 +759,7 @@ msgstr "公钥“%s”有对应的私钥！\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
@@ -763,7 +778,7 @@ msgstr "使用对称加密算法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -788,7 +803,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -800,7 +815,7 @@ msgstr "警告：强行使用的 %s (%d)压缩算法不在收件者的首选项�
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "强行使用的 %s (%d)对称加密算法不在收件者的首选项中\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "您不该将 %s 用于 %s 模式中\n"
@@ -810,12 +825,12 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
@@ -885,79 +900,73 @@ msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "这份签字会被标记成不可吊销。\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+#: g10/export.c:65
+#, fuzzy
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "没有找到“%s”的吊销密钥\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "不可用的私钥"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "无法存储密钥：%s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -965,127 +974,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签字"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签字"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "生成一份分离的签字"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "验证签字"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "列出密钥和签字"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签字"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "为某把密钥添加签字"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签字"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签字"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1095,51 +1104,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签字或解密"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1147,7 +1156,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1167,17 +1176,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1187,7 +1196,7 @@ msgstr ""
 "签字、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1195,568 +1204,568 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -1764,26 +1773,31 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
@@ -2146,15 +2160,12 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "不可用的私钥"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2279,231 +2290,231 @@ msgstr "以避免可能的算法不匹配问题\n"
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签字所致\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签字\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签字没有用户标识\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2512,65 +2523,65 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签字\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
@@ -2594,51 +2605,51 @@ msgstr "建立‘%s’时发生错误：%s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[自身签字]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签字\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签字\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签字因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签字因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2649,17 +2660,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2668,46 +2679,46 @@ msgstr ""
 "请输入这份信任签字的深度。\n"
 "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签字吗？(y/N)"
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签字。\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2716,75 +2727,75 @@ msgstr ""
 "“%s”的自身签字是 PGP 2.x 样\n"
 "式的签字。\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签字已经过期了。\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签字是一份本地签字。\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签字\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签字\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签字吗？(y/N)"
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签字\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签字。\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2793,31 +2804,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2826,74 +2837,74 @@ msgstr ""
 "您真的确定要签字这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签字。\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签字不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签字不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签字会被标记成不可导出。\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签字会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签字时失败： %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2901,11 +2912,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2913,158 +2924,161 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签字移动到正确的位置去\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "检查签字"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签字"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签字"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签字"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签字"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签字"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1445
-#, fuzzy
-msgid "clean unusable parts from key"
-msgstr "不可用的私钥"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3203,132 +3217,132 @@ msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3337,55 +3351,55 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签字吗？(y/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签字吗？(y/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签字。\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3212
-#, fuzzy, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "用户标识“%s”已经被吊销。\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 #, fuzzy
 msgid "invalid"
 msgstr "无效的 ASCII 封装格式"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "用户标识“%s”已经被吊销。\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3394,175 +3408,175 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签字：\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -3907,7 +3921,7 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4061,30 +4075,30 @@ msgstr "不是人类能读懂的"
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "主钥指纹："
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "子钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr " 主钥指纹："
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr " 子钥指纹："
 
 #  use tty
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "密钥指纹 ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
@@ -4131,352 +4145,385 @@ msgstr "缓存了 %lu 把密钥(%lu 份签字)\n"
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "搜索“%s”，在 %s 上\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "完好的签字，来自于“%s”"
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "签字验证已被抑制\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "无法处理这些多重签字\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签字建立于 %s\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签字，来自于“%s”"
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签字，来自于“%s”"
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签字，来自于“%s”"
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签字已于 %s 过期。\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签字在 %s 过期。\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签字，散列算法 %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签字：%s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签字\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签字。只检查第一个签字。\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签字\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签字\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -4623,34 +4670,34 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4661,44 +4708,44 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "请输入密码："
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码："
 
@@ -4746,23 +4793,23 @@ msgstr "这张照片正确吗？(y/N/q)"
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
@@ -4829,7 +4876,7 @@ msgstr ""
 "这把密钥的最小信任等级为：%s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "您的决定是什么？"
 
@@ -4900,65 +4947,73 @@ msgstr "警告：这把子钥已经被它的持有者吊销了！\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "注意：这把密钥已经被禁用了。\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "注意：这把密钥已经过期了！\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告：这把密钥未经受信任的签字认证！\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "      没有证据表明这个签字属于它所声称的持有者。\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告：我们不信任这把密钥！\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "      这个签字很有可能是伪造的。\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告：这把密钥未经有足够信任度的签字所认证。\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "      这份签字并不一定属于它所声称的持有者\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s：已跳过：%s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳过：公钥已存在\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "您没有指定用户标识。(您可以在命令行中用“-r”指定)\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "当前收件人：\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4966,33 +5021,33 @@ msgstr ""
 "\n"
 "输入用户标识。以空白行结束："
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "没有这个用户标识。\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳过：公钥已被设为默认收件者\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "公钥被禁用。\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "已跳过：公钥已被设定\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的默认收件者“%s”\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s：已跳过：公钥已被禁用\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "没有有效的地址\n"
 
@@ -5031,35 +5086,35 @@ msgstr "无法打开有签字的数据‘%s’\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者；正在尝试使用私钥 %s ……\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名收件者。\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "对称加密算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：收件人的首选项中找不到加密算法 %s\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "注意：密钥已被吊销"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失败：%s\n"
@@ -5069,63 +5124,63 @@ msgstr "build_packet 失败：%s\n"
 msgid "key %s has no user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "将被吊销，吊销者：\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(这是一把敏感的吊销密钥)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份指定吊销者证书吗？(y/N)"
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "已强行使用 ASCII 封装过的输出。\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失败： %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "已建立吊销证书。\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "没有找到“%s”的吊销密钥\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥“%s”：%s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "没有相对应的公钥：%s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "公钥与私钥不吻合！\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要为这把密钥建立一份吊销证书吗？(y/N)"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "未知的保护算法\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意：这把密钥没有被保护！\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5143,33 +5198,33 @@ msgstr ""
 "小心：您的机器上的打印系统可能会在打印过程中把这些数据临时在某个其他\n"
 "人也能够看得到的地方！\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "请选择吊销的原因：\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也许您会想要在这里选择 %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "请输入描述(可选)；以空白行结束：\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "吊销原因：%s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(不给定描述)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "这样可以吗？ (y/N)"
 
@@ -5317,25 +5372,25 @@ msgstr "检查已建立的签字时发生错误： %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签字来自：“%s”\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强行使用的 %s (%d)散列算法不在收件者的首选项中\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "正在签字："
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
@@ -5590,122 +5645,126 @@ msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型(%d)――假定使用 %s 信任模型\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 translator see trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[已吊销]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[已过期]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[ 未知 ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[未定义]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[ 勉强 ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[ 完全 ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[ 绝对 ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "未定义"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "从不"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "勉强"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "绝对"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "使用‘%s’信任模型时不需要更新信任度数据库\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, 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:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -5941,6 +6000,11 @@ msgstr "已取消"
 msgid "no card"
 msgstr "没有卡"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "不含签字的数据\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "错误："
@@ -5999,19 +6063,19 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "警告：正在使用不安全的内存！\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "请访问 http://www.gnupg.org/faq.html 以获得更详细的信息\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "安全内存未初始化，不能进行操作\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cd2a7a2ac..a3c59497b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-11-20 17:57+0100\n"
+"POT-Creation-Date: 2006-02-14 15:28+0100\n"
 "PO-Revision-Date: 2005-06-23 02:36+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -27,70 +27,80 @@ msgstr "無法以 %u 位元長的 p 以及 %u 位元長的 q 產生質數\n"
 msgid "can't generate a prime with less than %d bits\n"
 msgstr "無法產生少於 %d 位元的質數\n"
 
-#: cipher/random.c:164
+#: cipher/random.c:173
 msgid "no entropy gathering module detected\n"
 msgstr "偵測不到亂數蒐集模組\n"
 
-#: cipher/random.c:388 g10/card-util.c:677 g10/card-util.c:746
+#: cipher/random.c:403
+#, fuzzy, c-format
+msgid "can't lock `%s': %s\n"
+msgstr "無法鎖定 `%s'\n"
+
+#: cipher/random.c:408
+#, fuzzy, c-format
+msgid "waiting for lock on `%s'...\n"
+msgstr "正在將私鑰寫至 `%s'\n"
+
+#: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:985 g10/gpg.c:3309 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:783 g10/sign.c:937 g10/sign.c:1050
-#: g10/sign.c:1200 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
+#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: cipher/random.c:392
+#: cipher/random.c:458
 #, c-format
 msgid "can't stat `%s': %s\n"
 msgstr "無法取得檔案 `%s' 的資訊: %s\n"
 
-#: cipher/random.c:397
+#: cipher/random.c:463
 #, c-format
 msgid "`%s' is not a regular file - ignored\n"
 msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
 
-#: cipher/random.c:402
+#: cipher/random.c:468
 msgid "note: random_seed file is empty\n"
 msgstr "請注意: random_seed 檔案是空的\n"
 
-#: cipher/random.c:408
+#: cipher/random.c:474
 msgid "WARNING: invalid size of random_seed file - not used\n"
 msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
 
-#: cipher/random.c:416
+#: cipher/random.c:482
 #, c-format
 msgid "can't read `%s': %s\n"
 msgstr "無法讀取 `%s': %s\n"
 
-#: cipher/random.c:454
+#: cipher/random.c:520
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/gpg.c:984 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
-#: g10/openfile.c:355 g10/sign.c:801 g10/sign.c:1066 g10/tdbio.c:536
+#: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: cipher/random.c:481
+#: cipher/random.c:556 cipher/random.c:566
 #, c-format
 msgid "can't write `%s': %s\n"
 msgstr "無法寫入 `%s': %s\n"
 
-#: cipher/random.c:484
+#: cipher/random.c:569
 #, c-format
 msgid "can't close `%s': %s\n"
 msgstr "無法關閉 `%s': %s\n"
 
-#: cipher/random.c:729
+#: cipher/random.c:814
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
 
-#: cipher/random.c:730
+#: cipher/random.c:815
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -104,7 +114,7 @@ msgstr ""
 "*** 絕對不要把這個程式產生的任何資料拿來用!! ***\n"
 "\n"
 
-#: cipher/rndegd.c:205
+#: cipher/rndegd.c:202
 msgid ""
 "Please wait, entropy is being gathered. Do some work if it would\n"
 "keep you from getting bored, because it will improve the quality\n"
@@ -113,7 +123,7 @@ msgstr ""
 "請稍待片刻, 系統此時正在蒐集亂數. 如果妳會覺得無聊的話,\n"
 "不妨做些別的事, 這樣子甚至能夠讓亂數的品質更好.\n"
 
-#: cipher/rndlinux.c:135
+#: cipher/rndlinux.c:132
 #, c-format
 msgid ""
 "\n"
@@ -151,18 +161,18 @@ msgstr "回應中未包含 RSA 系數\n"
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
-#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2150
+#: g10/app-openpgp.c:1258 g10/app-openpgp.c:1346 g10/app-openpgp.c:2154
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "個人識別碼 (PIN) 收回時傳回錯誤: %s\n"
 
-#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2156
+#: g10/app-openpgp.c:1264 g10/app-openpgp.c:1352 g10/app-openpgp.c:2160
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV %d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
 #: g10/app-openpgp.c:1273 g10/app-openpgp.c:1287 g10/app-openpgp.c:1362
-#: g10/app-openpgp.c:2165 g10/app-openpgp.c:2179
+#: g10/app-openpgp.c:2169 g10/app-openpgp.c:2183
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV %d 失敗: %s\n"
@@ -171,11 +181,11 @@ msgstr "驗證 CHV %d 失敗: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "取用管理者指令尚未被組態過\n"
 
-#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2385
+#: g10/app-openpgp.c:1325 g10/app-openpgp.c:2389
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2394
+#: g10/app-openpgp.c:1331 g10/app-openpgp.c:2398
 msgid "card is permanently locked!\n"
 msgstr "卡片已被永久鎖住了!!\n"
 
@@ -268,22 +278,27 @@ msgstr "金鑰產生已完工 (%d 秒)\n"
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP 卡片的格式無效 (DO 0x93)\n"
 
-#: g10/app-openpgp.c:2130
+#: g10/app-openpgp.c:2087
+#, fuzzy, c-format
+msgid "card does not support digest algorithm %s\n"
+msgstr "%s 簽章, 摘要演算法 %s\n"
+
+#: g10/app-openpgp.c:2134
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: g10/app-openpgp.c:2138
+#: g10/app-openpgp.c:2142
 #, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: g10/app-openpgp.c:2399
+#: g10/app-openpgp.c:2403
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
-#: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
+#: g10/app-openpgp.c:2474 g10/app-openpgp.c:2484
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -293,70 +308,70 @@ msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
 msgid "armor: %s\n"
 msgstr "封裝: %s\n"
 
-#: g10/armor.c:347
+#: g10/armor.c:357
 msgid "invalid armor header: "
 msgstr "無效的封裝檔頭: "
 
-#: g10/armor.c:354
+#: g10/armor.c:368
 msgid "armor header: "
 msgstr "封裝檔頭: "
 
-#: g10/armor.c:365
+#: g10/armor.c:379
 msgid "invalid clearsig header\n"
 msgstr "無效的明文簽章檔頭\n"
 
-#: g10/armor.c:417
+#: g10/armor.c:431
 msgid "nested clear text signatures\n"
 msgstr "多層明文簽章\n"
 
-#: g10/armor.c:552
+#: g10/armor.c:566
 msgid "unexpected armor: "
 msgstr "未預期的封裝: "
 
-#: g10/armor.c:564
+#: g10/armor.c:578
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:716 g10/armor.c:1323
+#: g10/armor.c:730 g10/armor.c:1337
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 被跳過了\n"
 
-#: g10/armor.c:759
+#: g10/armor.c:773
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:793
+#: g10/armor.c:807
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:801
+#: g10/armor.c:815
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:805 g10/armor.c:1360
+#: g10/armor.c:819 g10/armor.c:1374
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:825
+#: g10/armor.c:839
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:829
+#: g10/armor.c:843
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1138
+#: g10/armor.c:1152
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1143
+#: g10/armor.c:1157
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1147
+#: g10/armor.c:1161
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
@@ -372,12 +387,12 @@ msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
 #: g10/card-util.c:76 g10/card-util.c:1405 g10/delkey.c:128 g10/keyedit.c:1518
-#: g10/keygen.c:2458 g10/revoke.c:217 g10/revoke.c:418
+#: g10/keygen.c:2458 g10/revoke.c:218 g10/revoke.c:456
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
 #: g10/card-util.c:103 g10/card-util.c:1131 g10/card-util.c:1214
-#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1290
+#: g10/keyedit.c:423 g10/keyedit.c:444 g10/keyedit.c:458 g10/keygen.c:1290
 #: g10/keygen.c:1357
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
@@ -544,8 +559,8 @@ msgstr "   (2) 加密用金鑰\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:945
-#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:647
+#: g10/card-util.c:1142 g10/card-util.c:1225 g10/keyedit.c:944
+#: g10/keygen.c:1294 g10/keygen.c:1322 g10/keygen.c:1396 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -565,7 +580,7 @@ msgstr "私鑰部分無法取用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1318 g10/keyedit.c:1355
+#: g10/card-util.c:1318 g10/keyedit.c:1354
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -573,7 +588,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1321 g10/keyedit.c:1358
+#: g10/card-util.c:1321 g10/keyedit.c:1357
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -641,7 +656,7 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1601 g10/keyedit.c:2243
+#: g10/card-util.c:1601 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -686,7 +701,7 @@ msgstr "請再次輸入個人識別碼 (PIN): "
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3659 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -696,14 +711,14 @@ msgstr "無法開啟 `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:75 g10/export.c:316 g10/keyedit.c:3389 g10/keyserver.c:1584
-#: g10/revoke.c:227
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:346 g10/import.c:2342 g10/keyserver.c:1598
-#: g10/revoke.c:233 g10/revoke.c:440
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時發生錯誤: %s\n"
@@ -742,7 +757,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:213 g10/sign.c:1220
+#: g10/encode.c:213 g10/sign.c:1230
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語的時候發生錯誤: %s\n"
@@ -761,7 +776,7 @@ msgstr "正在使用編密法 %s\n"
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:568
+#: g10/encode.c:306 g10/encode.c:598 g10/sign.c:572
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是一個空檔案\n"
@@ -786,7 +801,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用對稱式編密法 %s (%d) 會違反收件者偏好設定\n"
 
-#: g10/encode.c:642 g10/sign.c:901
+#: g10/encode.c:642 g10/sign.c:911
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -798,7 +813,7 @@ msgstr "警告: 強迫使用壓縮演算法 %s (%d) 會違反收件者偏好設�
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:799 g10/pkclist.c:799 g10/pkclist.c:847
+#: g10/encode.c:799 g10/pkclist.c:803 g10/pkclist.c:851
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "妳不能夠將 %s 用於 %s 模式中\n"
@@ -808,12 +823,12 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:302
+#: g10/encr-data.c:67 g10/mainproc.c:306
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:306
+#: g10/encr-data.c:69 g10/mainproc.c:310
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
@@ -883,79 +898,73 @@ msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:62
+#: g10/export.c:61
 #, fuzzy
 msgid "export signatures that are marked as local-only"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/export.c:64
+#: g10/export.c:63
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr ""
 
-#: g10/export.c:66
-msgid "export revocation keys that are marked as \"sensitive\""
-msgstr ""
-
-#: g10/export.c:68
-msgid "remove unusable signatures during export"
-msgstr ""
-
-#: g10/export.c:70
-msgid "remove unusable user IDs during export"
-msgstr ""
-
-#: g10/export.c:72
-msgid "all export-clean-* options from above"
-msgstr ""
-
-#: g10/export.c:75
-msgid "export the smallest key possible"
-msgstr ""
+#: g10/export.c:65
+#, fuzzy
+msgid "export revocation keys marked as \"sensitive\""
+msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/export.c:77
+#: g10/export.c:67
 #, fuzzy
 msgid "remove the passphrase from exported subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/export.c:330
+#: g10/export.c:69
+#, fuzzy
+msgid "remove unusable parts from key during export"
+msgstr "從金鑰中清除無法使用的部分"
+
+#: g10/export.c:71
+msgid "remove as much as possible from key during export"
+msgstr ""
+
+#: g10/export.c:325
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:359
+#: g10/export.c:354
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:367
+#: g10/export.c:362
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
-#: g10/export.c:378
+#: g10/export.c:373
 #, fuzzy, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/export.c:543
+#: g10/export.c:521
 msgid "about to export an unprotected subkey\n"
 msgstr ""
 
-#: g10/export.c:566
+#: g10/export.c:544
 #, fuzzy, c-format
 msgid "failed to unprotect the subkey: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:587
+#: g10/export.c:565
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:620
+#: g10/export.c:598
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/gpg.c:367
+#: g10/gpg.c:372
 msgid ""
 "@Commands:\n"
 " "
@@ -963,127 +972,127 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:369
+#: g10/gpg.c:374
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:370
+#: g10/gpg.c:375
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:371
+#: g10/gpg.c:376
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:377
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:374
+#: g10/gpg.c:379
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:381
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:378
+#: g10/gpg.c:383
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:380
+#: g10/gpg.c:385
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:382
+#: g10/gpg.c:387
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:388
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:384
+#: g10/gpg.c:389
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:390
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:386
+#: g10/gpg.c:391
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:392
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:394
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:395
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:396
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:397
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:393
+#: g10/gpg.c:398
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:400
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:401
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:402
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:399
+#: g10/gpg.c:404
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:406
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:410
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:407
+#: g10/gpg.c:413
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:408
+#: g10/gpg.c:414
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:409
+#: g10/gpg.c:415
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:417
+#: g10/gpg.c:423
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:424
+#: g10/gpg.c:430
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:428 g10/gpgv.c:71
+#: g10/gpg.c:434 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1093,51 +1102,51 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:430
+#: g10/gpg.c:436
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:432
+#: g10/gpg.c:438
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:443
+#: g10/gpg.c:449
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:444
+#: g10/gpg.c:450
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:455
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:463
+#: g10/gpg.c:469
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:465 g10/gpgv.c:73
+#: g10/gpg.c:471 g10/gpgv.c:73
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:477
+#: g10/gpg.c:483
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:524
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:525
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:547
+#: g10/gpg.c:553
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1145,7 +1154,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:550
+#: g10/gpg.c:556
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1165,15 +1174,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:739 g10/gpgv.c:98
+#: g10/gpg.c:746 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:756
+#: g10/gpg.c:763
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:759
+#: g10/gpg.c:766
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1183,7 +1192,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:770
+#: g10/gpg.c:777
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1191,567 +1200,567 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:780
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:779 g10/keyedit.c:2281
+#: g10/gpg.c:786 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:785
+#: g10/gpg.c:792
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:791 g10/keyedit.c:2327
+#: g10/gpg.c:798 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:874
+#: g10/gpg.c:881
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1022
+#: g10/gpg.c:1029
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1040
+#: g10/gpg.c:1047
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1237
+#: g10/gpg.c:1244
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1240
+#: g10/gpg.c:1247
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1243
+#: g10/gpg.c:1250
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1249
+#: g10/gpg.c:1256
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1252
+#: g10/gpg.c:1259
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1255
+#: g10/gpg.c:1262
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1261
+#: g10/gpg.c:1268
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1264
+#: g10/gpg.c:1271
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1267
+#: g10/gpg.c:1274
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1273
+#: g10/gpg.c:1280
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1276
+#: g10/gpg.c:1283
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1279
+#: g10/gpg.c:1286
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1420
+#: g10/gpg.c:1427
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1513
+#: g10/gpg.c:1521
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1515
+#: g10/gpg.c:1523
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1517
+#: g10/gpg.c:1525
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1519
+#: g10/gpg.c:1527
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1531
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1533
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1535
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1529
+#: g10/gpg.c:1537
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1539
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1541
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1543
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1830
+#: g10/gpg.c:1874
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:1872
+#: g10/gpg.c:1916
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1876
+#: g10/gpg.c:1920
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/gpg.c:1883
+#: g10/gpg.c:1927
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:2097 g10/gpg.c:2665 g10/gpg.c:2684
+#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2110
+#: g10/gpg.c:2158
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2264 g10/gpg.c:2276
+#: g10/gpg.c:2312 g10/gpg.c:2324
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2352
+#: g10/gpg.c:2400
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2371 g10/keyedit.c:4050
+#: g10/gpg.c:2422 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2377
+#: g10/gpg.c:2428
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2380
+#: g10/gpg.c:2431
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2387
+#: g10/gpg.c:2438
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2390
+#: g10/gpg.c:2441
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2397
+#: g10/gpg.c:2448
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2451
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2407
+#: g10/gpg.c:2458
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2410
+#: g10/gpg.c:2461
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2418
+#: g10/gpg.c:2469
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2420
+#: g10/gpg.c:2471
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2422
+#: g10/gpg.c:2473
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2424
+#: g10/gpg.c:2475
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2479
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2430
+#: g10/gpg.c:2481
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2432
+#: g10/gpg.c:2483
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2434
+#: g10/gpg.c:2485
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2492
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2444
+#: g10/gpg.c:2495
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2502
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2654
+#: g10/gpg.c:2705
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2658
+#: g10/gpg.c:2709
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2667
+#: g10/gpg.c:2718
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2721
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2677
+#: g10/gpg.c:2728
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意: %s 在本版中無法使用\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2743
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2757
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2712
+#: g10/gpg.c:2763
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2769
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2731
+#: g10/gpg.c:2782
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2798 g10/gpg.c:2822
+#: g10/gpg.c:2849 g10/gpg.c:2873
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2804 g10/gpg.c:2828
+#: g10/gpg.c:2855 g10/gpg.c:2879
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:2810
+#: g10/gpg.c:2861
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:2816
+#: g10/gpg.c:2867
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:2831
+#: g10/gpg.c:2882
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:2833
+#: g10/gpg.c:2884
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:2835
+#: g10/gpg.c:2886
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:2837
+#: g10/gpg.c:2888
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:2839
+#: g10/gpg.c:2890
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:2842
+#: g10/gpg.c:2893
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:2846
+#: g10/gpg.c:2897
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:2853
+#: g10/gpg.c:2904
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:2862
+#: g10/gpg.c:2913
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:2866
+#: g10/gpg.c:2917
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:2870
+#: g10/gpg.c:2921
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:2903
+#: g10/gpg.c:2954
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:2950
+#: g10/gpg.c:3001
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:2955
+#: g10/gpg.c:3006
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:2960
+#: g10/gpg.c:3011
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3056
+#: g10/gpg.c:3107
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3067
+#: g10/gpg.c:3118
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3078
+#: g10/gpg.c:3129
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3085
+#: g10/gpg.c:3136
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3138
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3097
+#: g10/gpg.c:3148
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3110
+#: g10/gpg.c:3161
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3112
+#: g10/gpg.c:3163
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3115
+#: g10/gpg.c:3166
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3133
+#: g10/gpg.c:3184
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3146
+#: g10/gpg.c:3197
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3212
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3214
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3217
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3186
+#: g10/gpg.c:3237
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3195
+#: g10/gpg.c:3246
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3271
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3228
+#: g10/gpg.c:3279
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3232
+#: g10/gpg.c:3283
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3304
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3375
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3361
+#: g10/gpg.c:3412
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3363
+#: g10/gpg.c:3414
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3416
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3427
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3386
+#: g10/gpg.c:3437
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3488
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3435
+#: g10/gpg.c:3496
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3522
+#: g10/gpg.c:3583
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3645
+#: g10/gpg.c:3706
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3649
+#: g10/gpg.c:3710
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:3939
+#: g10/gpg.c:4000
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/gpg.c:3947
+#: g10/gpg.c:4008
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/gpg.c:3952
+#: g10/gpg.c:4013
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 
-#: g10/gpg.c:3963
+#: g10/gpg.c:4024
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:4058
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:3999
+#: g10/gpg.c:4060
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4032
+#: g10/gpg.c:4093
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -1759,26 +1768,31 @@ msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 快取裡有太多項目 - 已禁用\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2805
+#: g10/getkey.c:188 g10/getkey.c:2845
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:1731
+#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#, c-format
+msgid "Automatically retrieved `%s' via %s\n"
+msgstr ""
+
+#: g10/getkey.c:1769
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2283
+#: g10/getkey.c:2323
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2514
+#: g10/getkey.c:2554
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2561
+#: g10/getkey.c:2601
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
@@ -2153,15 +2167,12 @@ msgid "only accept updates to existing keys"
 msgstr ""
 
 #: g10/import.c:105
-msgid "remove unusable signatures after import"
-msgstr ""
+#, fuzzy
+msgid "remove unusable parts from key after import"
+msgstr "從金鑰中清除無法使用的部分"
 
 #: g10/import.c:107
-msgid "remove unusable user IDs after import"
-msgstr ""
-
-#: g10/import.c:109
-msgid "all import-clean-* options from above"
+msgid "remove as much as possible from key after import"
 msgstr ""
 
 #: g10/import.c:262
@@ -2286,231 +2297,231 @@ msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:726 g10/import.c:1112
+#: g10/import.c:712 g10/import.c:1092
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:756
+#: g10/import.c:741
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:771
+#: g10/import.c:756
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:777
+#: g10/import.c:762
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:779
+#: g10/import.c:764
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:789 g10/import.c:1233
+#: g10/import.c:774 g10/import.c:1213
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:795
+#: g10/import.c:780
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:804
+#: g10/import.c:789
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:809 g10/openfile.c:265 g10/sign.c:806 g10/sign.c:1071
+#: g10/import.c:794 g10/openfile.c:265 g10/sign.c:810 g10/sign.c:1081
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:815 g10/import.c:913 g10/import.c:1152 g10/import.c:1294
-#: g10/import.c:2356 g10/import.c:2378
+#: g10/import.c:798 g10/import.c:893 g10/import.c:1132 g10/import.c:1274
+#: g10/import.c:2336 g10/import.c:2358
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:817
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:858
+#: g10/import.c:841
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:875 g10/import.c:1251
+#: g10/import.c:858 g10/import.c:1231
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:883 g10/import.c:1258
+#: g10/import.c:866 g10/import.c:1238
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:923
+#: g10/import.c:903
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:906
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:929
+#: g10/import.c:909
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:932
+#: g10/import.c:912
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:935
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:938
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:941
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:944
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 份簽章\n"
 
-#: g10/import.c:947
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:950
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除掉 %d 個使用者 ID\n"
 
-#: g10/import.c:973
+#: g10/import.c:953
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1118
+#: g10/import.c:1098
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1129
+#: g10/import.c:1109
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1146 g10/import.c:2371
+#: g10/import.c:1126 g10/import.c:2351
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1157
+#: g10/import.c:1137
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1186
+#: g10/import.c:1166
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1196
+#: g10/import.c:1176
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1226
+#: g10/import.c:1206
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1269
+#: g10/import.c:1249
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1301
+#: g10/import.c:1281
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1367
+#: g10/import.c:1347
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1382
+#: g10/import.c:1362
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1384
+#: g10/import.c:1364
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1402
+#: g10/import.c:1382
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1413 g10/import.c:1463
+#: g10/import.c:1393 g10/import.c:1443
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1395
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1430
+#: g10/import.c:1410
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1452
+#: g10/import.c:1432
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1465
+#: g10/import.c:1445
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1480
+#: g10/import.c:1460
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1522
+#: g10/import.c:1502
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1543
+#: g10/import.c:1523
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2519,65 +2530,65 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1570
+#: g10/import.c:1550
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 %02X) - 已跳過\n"
 
-#: g10/import.c:1580
+#: g10/import.c:1560
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1597
+#: g10/import.c:1577
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1611
+#: g10/import.c:1591
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1619
+#: g10/import.c:1599
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1719
+#: g10/import.c:1699
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1761
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1795
+#: g10/import.c:1775
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1854
+#: g10/import.c:1834
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1888
+#: g10/import.c:1868
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2257
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2285
+#: g10/import.c:2265
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2287
+#: g10/import.c:2267
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
@@ -2601,51 +2612,51 @@ msgstr "金鑰區塊資源 `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:265
+#: g10/keyedit.c:264
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:266
+#: g10/keyedit.c:265
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:344 g10/keylist.c:406
+#: g10/keyedit.c:343 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:346 g10/keylist.c:408
+#: g10/keyedit.c:345 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:348 g10/keylist.c:410
+#: g10/keyedit.c:347 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:350 g10/keylist.c:412
+#: g10/keyedit.c:349 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:352 g10/keylist.c:414
+#: g10/keyedit.c:351 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:354 g10/keylist.c:416
+#: g10/keyedit.c:353 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:356
+#: g10/keyedit.c:355
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:358
+#: g10/keyedit.c:357
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:414 g10/pkclist.c:263
+#: g10/keyedit.c:413 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2655,17 +2666,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:418 g10/pkclist.c:275
+#: g10/keyedit.c:417 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:419 g10/pkclist.c:277
+#: g10/keyedit.c:418 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:438
+#: g10/keyedit.c:437
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2675,45 +2686,45 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:454
+#: g10/keyedit.c:453
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:598
+#: g10/keyedit.c:597
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1736
+#: g10/keyedit.c:606 g10/keyedit.c:634 g10/keyedit.c:661 g10/keyedit.c:829
+#: g10/keyedit.c:894 g10/keyedit.c:1736
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:620 g10/keyedit.c:648 g10/keyedit.c:675 g10/keyedit.c:835
 #: g10/keyedit.c:1742
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:626
+#: g10/keyedit.c:625
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:654
+#: g10/keyedit.c:653
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:682
+#: g10/keyedit.c:681
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:684
+#: g10/keyedit.c:683
 msgid "Sign it? (y/N) "
 msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:706
+#: g10/keyedit.c:705
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2722,11 +2733,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:715
+#: g10/keyedit.c:714
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:729
+#: g10/keyedit.c:728
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2735,11 +2746,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:733
+#: g10/keyedit.c:732
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:754
+#: g10/keyedit.c:753
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2748,53 +2759,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:758
+#: g10/keyedit.c:757
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:782
+#: g10/keyedit.c:781
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:787
+#: g10/keyedit.c:786
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:809
+#: g10/keyedit.c:808
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:824
+#: g10/keyedit.c:823
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:842
+#: g10/keyedit.c:841
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:848
+#: g10/keyedit.c:847
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:888
+#: g10/keyedit.c:887
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
-#: g10/keyedit.c:890
+#: g10/keyedit.c:889
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2803,31 +2814,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:920
+#: g10/keyedit.c:919
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:921
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:924
+#: g10/keyedit.c:923
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:926
+#: g10/keyedit.c:925
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:932
+#: g10/keyedit.c:931
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:956
+#: g10/keyedit.c:955
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2836,74 +2847,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:962
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:969
+#: g10/keyedit.c:968
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:977
+#: g10/keyedit.c:976
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:987
+#: g10/keyedit.c:986
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:994
+#: g10/keyedit.c:993
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1011
+#: g10/keyedit.c:1010
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1021
+#: g10/keyedit.c:1020
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4556 g10/keyedit.c:4647 g10/keyedit.c:4711
-#: g10/keyedit.c:4772 g10/sign.c:370
+#: g10/keyedit.c:1065 g10/keyedit.c:4503 g10/keyedit.c:4594 g10/keyedit.c:4658
+#: g10/keyedit.c:4719 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1131
+#: g10/keyedit.c:1130
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3087
+#: g10/keyedit.c:1141 g10/keygen.c:3087
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3075 g10/revoke.c:501
+#: g10/keyedit.c:1145 g10/keygen.c:3075 g10/revoke.c:539
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3090
+#: g10/keyedit.c:1149 g10/keygen.c:3090
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1154 g10/keygen.c:3094
+#: g10/keyedit.c:1153 g10/keygen.c:3094
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1178
+#: g10/keyedit.c:1177
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1184
+#: g10/keyedit.c:1183
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2911,11 +2922,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1193 g10/keygen.c:1806
+#: g10/keyedit.c:1192 g10/keygen.c:1806
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1198
+#: g10/keyedit.c:1197
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2923,157 +2934,161 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1201
+#: g10/keyedit.c:1200
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1271
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1357
+#: g10/keyedit.c:1356
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1360
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1364
+#: g10/keyedit.c:1363
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1365
+#: g10/keyedit.c:1364
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1369
+#: g10/keyedit.c:1368
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1374
+#: g10/keyedit.c:1373
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1381
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1384
+#: g10/keyedit.c:1383
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1385
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1394
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1409
+#: g10/keyedit.c:1408
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1411
+#: g10/keyedit.c:1410
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1413
+#: g10/keyedit.c:1412
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1416
+#: g10/keyedit.c:1415
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1418
+#: g10/keyedit.c:1417
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1420
+#: g10/keyedit.c:1419
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1430
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1432
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1440
+#: g10/keyedit.c:1439
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1441
+#: g10/keyedit.c:1440
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1441
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1443
+#: g10/keyedit.c:1442
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1445
-msgid "clean unusable parts from key"
-msgstr "從金鑰中清除無法使用的部分"
+#: g10/keyedit.c:1444
+msgid "compact unusable user IDs and remove unusable signatures from key"
+msgstr ""
+
+#: g10/keyedit.c:1446
+msgid "compact unusable user IDs and remove all signatures from key"
+msgstr ""
 
 #: g10/keyedit.c:1564
 #, c-format
@@ -3213,111 +3228,111 @@ msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2204
+#: g10/keyedit.c:2189
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2207
+#: g10/keyedit.c:2192
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2217
+#: g10/keyedit.c:2202
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2224
+#: g10/keyedit.c:2209
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2231
+#: g10/keyedit.c:2216
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2304
+#: g10/keyedit.c:2289
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2356
+#: g10/keyedit.c:2341
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2367
+#: g10/keyedit.c:2352
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2382 g10/keylist.c:308
+#: g10/keyedit.c:2367 g10/keylist.c:308
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2611
+#: g10/keyedit.c:2579
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好.\n"
 
-#: g10/keyedit.c:2670
+#: g10/keyedit.c:2638
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 給撤銷了\n"
 
-#: g10/keyedit.c:2691
+#: g10/keyedit.c:2659
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 撤銷了 "
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2665
 msgid "(sensitive)"
 msgstr "(機密的)"
 
-#: g10/keyedit.c:2713 g10/keyedit.c:2769 g10/keyedit.c:2830 g10/keyedit.c:2845
-#: g10/keylist.c:194 g10/keyserver.c:450
+#: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
+#: g10/keylist.c:194 g10/keyserver.c:471
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2716 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:963
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2718 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
+#: g10/keyedit.c:2686 g10/keylist.c:758 g10/keylist.c:793 g10/keylist.c:887
 #, c-format
 msgid "expired: %s"
 msgstr "已過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2720 g10/keyedit.c:2771 g10/keyedit.c:2832 g10/keyedit.c:2847
+#: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:456 g10/mainproc.c:969
+#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
 
-#: g10/keyedit.c:2722
+#: g10/keyedit.c:2690
 #, c-format
 msgid "usage: %s"
 msgstr "用法: %s"
 
-#: g10/keyedit.c:2737
+#: g10/keyedit.c:2705
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2741
+#: g10/keyedit.c:2709
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2748
+#: g10/keyedit.c:2716
 msgid "This key has been disabled"
 msgstr "這把金鑰已經被禁用了"
 
-#: g10/keyedit.c:2776 g10/keylist.c:200
+#: g10/keyedit.c:2744 g10/keylist.c:200
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2800
+#: g10/keyedit.c:2768
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3325,17 +3340,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2864 g10/keyedit.c:3242 g10/keyserver.c:460
-#: g10/mainproc.c:1718 g10/trustdb.c:1179 g10/trustdb.c:1694
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
+#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2866 g10/keyedit.c:3244 g10/keyserver.c:464
-#: g10/mainproc.c:1720 g10/trustdb.c:532 g10/trustdb.c:1696
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
+#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:2931
+#: g10/keyedit.c:2899
 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"
@@ -3343,7 +3358,7 @@ msgstr ""
 "警告: 沒有任何使用者 ID 已被標示為主要 ID. 這項指令可能\n"
 "      會導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:2992
+#: g10/keyedit.c:2960
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3352,54 +3367,54 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:2997 g10/keyedit.c:3350
+#: g10/keyedit.c:2965 g10/keyedit.c:3295
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3003
+#: g10/keyedit.c:2971
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "妳不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3143
+#: g10/keyedit.c:3111
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這個完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3153
+#: g10/keyedit.c:3121
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這個無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3157
+#: g10/keyedit.c:3125
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這個未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3163
+#: g10/keyedit.c:3131
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這個自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3177
+#: g10/keyedit.c:3145
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3178
+#: g10/keyedit.c:3146
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 個簽章.\n"
 
-#: g10/keyedit.c:3181
+#: g10/keyedit.c:3149
 msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
-#: g10/keyedit.c:3212
-#, c-format
-msgid "User ID \"%s\": already clean.\n"
-msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
-
-#: g10/keyedit.c:3246 g10/trustdb.c:1698
+#: g10/keyedit.c:3182 g10/trustdb.c:1708
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3345
+#: g10/keyedit.c:3198
+#, fuzzy, c-format
+msgid "User ID \"%s\": already clean\n"
+msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
+
+#: g10/keyedit.c:3290
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3408,172 +3423,172 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3356
+#: g10/keyedit.c:3301
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3376
+#: g10/keyedit.c:3321
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3399
+#: g10/keyedit.c:3346
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3414
+#: g10/keyedit.c:3361
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3436
+#: g10/keyedit.c:3383
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3455
+#: g10/keyedit.c:3402
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3461
+#: g10/keyedit.c:3408
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3522
+#: g10/keyedit.c:3469
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3528
+#: g10/keyedit.c:3475
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3532
+#: g10/keyedit.c:3479
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3535
+#: g10/keyedit.c:3482
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3581
+#: g10/keyedit.c:3528
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3597
+#: g10/keyedit.c:3544
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3822
+#: g10/keyedit.c:3769
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3861 g10/keyedit.c:3971 g10/keyedit.c:4091
+#: g10/keyedit.c:3808 g10/keyedit.c:3918 g10/keyedit.c:4038
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4032
+#: g10/keyedit.c:3979
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4112
+#: g10/keyedit.c:4059
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4113
+#: g10/keyedit.c:4060
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4175
+#: g10/keyedit.c:4122
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4180
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4207
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4395
+#: g10/keyedit.c:4342
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4398 g10/keyedit.c:4462 g10/keyedit.c:4505
+#: g10/keyedit.c:4345 g10/keyedit.c:4409 g10/keyedit.c:4452
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4400 g10/keyedit.c:4464 g10/keyedit.c:4507
+#: g10/keyedit.c:4347 g10/keyedit.c:4411 g10/keyedit.c:4454
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4404
+#: g10/keyedit.c:4351
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4408
+#: g10/keyedit.c:4355
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4359
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4439
+#: g10/keyedit.c:4386
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4465
+#: g10/keyedit.c:4412
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4472
+#: g10/keyedit.c:4419
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4494
+#: g10/keyedit.c:4441
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4514
+#: g10/keyedit.c:4461
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4544
+#: g10/keyedit.c:4491
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4561
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4578
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4642
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4757
+#: g10/keyedit.c:4704
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4799
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -3917,7 +3932,7 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1807 g10/passphrase.c:817
+#: g10/keygen.c:1807 g10/passphrase.c:810
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4072,30 +4087,30 @@ msgstr "不是人類能讀得懂的"
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:1497
+#: g10/keylist.c:1521
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:1499
+#: g10/keylist.c:1523
 msgid "     Subkey fingerprint:"
 msgstr "               子鑰指紋:"
 
 #. TRANSLATORS: this should fit into 24 bytes to that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1506
+#: g10/keylist.c:1530
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:1508
+#: g10/keylist.c:1532
 msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1512 g10/keylist.c:1516
+#: g10/keylist.c:1536 g10/keylist.c:1540
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:1583
+#: g10/keylist.c:1607
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
@@ -4142,352 +4157,385 @@ msgstr "檢查了 %lu 份金鑰 (共 %lu 份簽章)\n"
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:76
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:80
+#: g10/keyserver.c:78
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:85
+#: g10/keyserver.c:83
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:89
+#: g10/keyserver.c:87
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
+#: g10/keyserver.c:89
+msgid "automatically retrieve keys from PKA records"
+msgstr ""
+
+#: g10/keyserver.c:91
+msgid "automatically retrieve keys from DNS"
+msgstr ""
+
 #: g10/keyserver.c:95
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyserver.c:130
+#: g10/keyserver.c:139
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:462
+#: g10/keyserver.c:483
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:663
+#: g10/keyserver.c:684
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:746 g10/keyserver.c:1309
+#: g10/keyserver.c:767 g10/keyserver.c:1368
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:844
+#: g10/keyserver.c:865
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:846
+#: g10/keyserver.c:867
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1056
+#: g10/keyserver.c:1092
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1060
+#: g10/keyserver.c:1096
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1212
+#: g10/keyserver.c:1120
+#, fuzzy, c-format
+msgid "searching for names from %s server %s\n"
+msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
+
+#: g10/keyserver.c:1123
+#, fuzzy, c-format
+msgid "searching for names from %s\n"
+msgstr "正在搜尋 \"%s\" 於 %s\n"
+
+#: g10/keyserver.c:1271
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1216
+#: g10/keyserver.c:1275
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1259
+#: g10/keyserver.c:1318
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1262
+#: g10/keyserver.c:1321
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1269 g10/keyserver.c:1364
+#: g10/keyserver.c:1328 g10/keyserver.c:1424
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1317
+#: g10/keyserver.c:1376
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1326
+#: g10/keyserver.c:1385
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1386
+#: g10/keyserver.c:1446
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1392
+#: g10/keyserver.c:1452
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1404
+#: g10/keyserver.c:1464
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1409
+#: g10/keyserver.c:1469
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1417
+#: g10/keyserver.c:1477
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1424
+#: g10/keyserver.c:1484
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1429
+#: g10/keyserver.c:1489
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1438
+#: g10/keyserver.c:1498
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1463 g10/keyserver.c:1497
+#: g10/keyserver.c:1523 g10/keyserver.c:1557
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1754
+#: g10/keyserver.c:1814
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1776
+#: g10/keyserver.c:1836
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1778
+#: g10/keyserver.c:1838
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/mainproc.c:249
+#: g10/keyserver.c:1903
+#, fuzzy, c-format
+msgid "WARNING: unable to fetch URI %s: %s\n"
+msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+
+#: g10/keyserver.c:1909
+#, fuzzy, c-format
+msgid "WARNING: unable to parse URI %s\n"
+msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
+
+#: g10/mainproc.c:253
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:300
+#: g10/mainproc.c:304
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:310
+#: g10/mainproc.c:314
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:391
+#: g10/mainproc.c:395
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:446
+#: g10/mainproc.c:450
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:479
+#: g10/mainproc.c:483
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:483 g10/pkclist.c:219
+#: g10/mainproc.c:487 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:487
+#: g10/mainproc.c:491
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:501
+#: g10/mainproc.c:505
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:515
+#: g10/mainproc.c:519
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:521
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:545 g10/mainproc.c:567
+#: g10/mainproc.c:549 g10/mainproc.c:571
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:553
+#: g10/mainproc.c:557
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:585
+#: g10/mainproc.c:589
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:593
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:602
+#: g10/mainproc.c:606
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:608
+#: g10/mainproc.c:612
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:627
+#: g10/mainproc.c:631
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:629
+#: g10/mainproc.c:633
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:818
+#: g10/mainproc.c:822
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1402
+#: g10/mainproc.c:1168
+#, fuzzy
+msgid "no signature found\n"
+msgstr "完好的簽章來自於 \"%s\""
+
+#: g10/mainproc.c:1418
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1444 g10/mainproc.c:1454
+#: g10/mainproc.c:1460 g10/mainproc.c:1470
 msgid "can't handle these multiple signatures\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1464
+#: g10/mainproc.c:1480
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1465
+#: g10/mainproc.c:1481
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1469
+#: g10/mainproc.c:1485
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1489
+#: g10/mainproc.c:1505
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1623 g10/mainproc.c:1671
+#: g10/mainproc.c:1639 g10/mainproc.c:1687
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1625 g10/mainproc.c:1673
+#: g10/mainproc.c:1641 g10/mainproc.c:1689
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1627 g10/mainproc.c:1675
+#: g10/mainproc.c:1643 g10/mainproc.c:1691
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1679
+#: g10/mainproc.c:1695
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1711
+#: g10/mainproc.c:1727
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1808
+#: g10/mainproc.c:1824
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1813
+#: g10/mainproc.c:1829
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1816
+#: g10/mainproc.c:1832
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1817
+#: g10/mainproc.c:1833
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1818
+#: g10/mainproc.c:1834
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1818 g10/trustdb.c:531
+#: g10/mainproc.c:1834 g10/trustdb.c:536
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1838
+#: g10/mainproc.c:1854
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1906 g10/mainproc.c:1922 g10/mainproc.c:2008
+#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:1949
+#: g10/mainproc.c:1965
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:1957
+#: g10/mainproc.c:1973
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2014
+#: g10/mainproc.c:2030
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2024
+#: g10/mainproc.c:2040
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -4634,34 +4682,34 @@ msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: g10/passphrase.c:333
+#: g10/passphrase.c:326
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: g10/passphrase.c:352
+#: g10/passphrase.c:345
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: g10/passphrase.c:369
+#: g10/passphrase.c:362
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:386 g10/passphrase.c:662 g10/passphrase.c:752
+#: g10/passphrase.c:379 g10/passphrase.c:655 g10/passphrase.c:745
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:539 g10/passphrase.c:921
+#: g10/passphrase.c:532 g10/passphrase.c:914
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:553
+#: g10/passphrase.c:546
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4672,27 +4720,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:578
+#: g10/passphrase.c:571
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:580
+#: g10/passphrase.c:573
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:656
+#: g10/passphrase.c:649
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:812 g10/passphrase.c:975
+#: g10/passphrase.c:805 g10/passphrase.c:968
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:819 g10/passphrase.c:980
+#: g10/passphrase.c:812 g10/passphrase.c:973
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
-#: g10/passphrase.c:902
+#: g10/passphrase.c:895
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4701,17 +4749,17 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:908
+#: g10/passphrase.c:901
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:917
+#: g10/passphrase.c:910
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
 
-#: g10/passphrase.c:984
+#: g10/passphrase.c:977
 msgid "Repeat passphrase: "
 msgstr "請再輸入一次密語: "
 
@@ -4760,23 +4808,23 @@ msgstr "這張照片正確嗎? (y/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:62 g10/revoke.c:585
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:64 g10/revoke.c:587
+#: g10/pkclist.c:64 g10/revoke.c:625
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:66 g10/revoke.c:586
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:68 g10/revoke.c:588
+#: g10/pkclist.c:68 g10/revoke.c:626
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:70 g10/revoke.c:589
+#: g10/pkclist.c:70 g10/revoke.c:627
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
@@ -4843,7 +4891,7 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:299 g10/revoke.c:614
+#: g10/pkclist.c:299 g10/revoke.c:652
 msgid "Your decision? "
 msgstr "妳的決定是甚麼? "
 
@@ -4915,65 +4963,73 @@ msgstr "警告: 這把子鑰已經被它的持有人撤銷了!\n"
 msgid "Note: This key has been disabled.\n"
 msgstr "請注意: 這把金鑰已經被禁用了.\n"
 
-#: g10/pkclist.c:552
+#: g10/pkclist.c:553
 #, c-format
 msgid "Note: Verified signer's address is `%s'\n"
 msgstr ""
 
-#: g10/pkclist.c:558
+#: g10/pkclist.c:560
 #, c-format
 msgid "Note: Signer's address `%s' does not match DNS entry\n"
 msgstr ""
 
-#: g10/pkclist.c:587
+#: g10/pkclist.c:572
+msgid "trustlevel adjusted to FULL due to valid PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:580
+msgid "trustlevel adjusted to NEVER due to bad PKA info\n"
+msgstr ""
+
+#: g10/pkclist.c:591
 msgid "Note: This key has expired!\n"
 msgstr "請注意: 這把金鑰已經過期了!\n"
 
-#: g10/pkclist.c:598
+#: g10/pkclist.c:602
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
-#: g10/pkclist.c:600
+#: g10/pkclist.c:604
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
-#: g10/pkclist.c:608
+#: g10/pkclist.c:612
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "警告: 我們 *不* 信任這把金鑰!\n"
 
-#: g10/pkclist.c:609
+#: g10/pkclist.c:613
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
-#: g10/pkclist.c:617
+#: g10/pkclist.c:621
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
-#: g10/pkclist.c:619
+#: g10/pkclist.c:623
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:818 g10/pkclist.c:860 g10/pkclist.c:1072 g10/pkclist.c:1142
+#: g10/pkclist.c:822 g10/pkclist.c:864 g10/pkclist.c:1076 g10/pkclist.c:1146
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:830 g10/pkclist.c:1110
+#: g10/pkclist.c:834 g10/pkclist.c:1114
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已經存在了\n"
 
-#: g10/pkclist.c:881
+#: g10/pkclist.c:885
 msgid "You did not specify a user ID. (you may use \"-r\")\n"
 msgstr "妳沒有指定一個使用者 ID. (妳可能得用 \"-r\")\n"
 
-#: g10/pkclist.c:905
+#: g10/pkclist.c:909
 msgid "Current recipients:\n"
 msgstr "目前的收件者:\n"
 
-#: g10/pkclist.c:931
+#: g10/pkclist.c:935
 msgid ""
 "\n"
 "Enter the user ID.  End with an empty line: "
@@ -4981,33 +5037,33 @@ msgstr ""
 "\n"
 "輸入使用者 ID. 以空白列結束: "
 
-#: g10/pkclist.c:956
+#: g10/pkclist.c:960
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:965 g10/pkclist.c:1039
+#: g10/pkclist.c:969 g10/pkclist.c:1043
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
-#: g10/pkclist.c:986
+#: g10/pkclist.c:990
 msgid "Public key is disabled.\n"
 msgstr "公鑰被禁用了.\n"
 
-#: g10/pkclist.c:995
+#: g10/pkclist.c:999
 msgid "skipped: public key already set\n"
 msgstr "已跳過: 公鑰已經被設過了\n"
 
-#: g10/pkclist.c:1030
+#: g10/pkclist.c:1034
 #, c-format
 msgid "unknown default recipient \"%s\"\n"
 msgstr "未知的預設收件者 \"%s\"\n"
 
-#: g10/pkclist.c:1088
+#: g10/pkclist.c:1092
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: 已跳過: 公鑰已經被禁用了\n"
 
-#: g10/pkclist.c:1150
+#: g10/pkclist.c:1154
 msgid "no valid addressees\n"
 msgstr "沒有有效的地址\n"
 
@@ -5046,35 +5102,35 @@ msgstr "無法開啟被簽署過的資料 `%s'\n"
 msgid "anonymous recipient; trying secret key %s ...\n"
 msgstr "匿名收件者; 正在嘗試使用私鑰 %s ...\n"
 
-#: g10/pubkey-enc.c:120
+#: g10/pubkey-enc.c:135
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好, 我們就是匿名收件者.\n"
 
-#: g10/pubkey-enc.c:208
+#: g10/pubkey-enc.c:223
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支援舊式的 DEK 編碼\n"
 
-#: g10/pubkey-enc.c:229
+#: g10/pubkey-enc.c:244
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "編密演算法 %d%s 未知或已停用了\n"
 
-#: g10/pubkey-enc.c:267
+#: g10/pubkey-enc.c:282
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "警告: 收件者偏好設定中找不到編密演算法 %s\n"
 
-#: g10/pubkey-enc.c:287
+#: g10/pubkey-enc.c:302
 #, c-format
 msgid "NOTE: secret key %s expired at %s\n"
 msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 
-#: g10/pubkey-enc.c:293
+#: g10/pubkey-enc.c:308
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已經被撤銷了"
 
 #: g10/revoke.c:104 g10/revoke.c:118 g10/revoke.c:130 g10/revoke.c:176
-#: g10/revoke.c:188 g10/revoke.c:550
+#: g10/revoke.c:188 g10/revoke.c:588
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -5084,63 +5140,63 @@ msgstr "build_packet 失敗: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "金鑰 %s 沒有使用者 ID\n"
 
-#: g10/revoke.c:273
+#: g10/revoke.c:308
 msgid "To be revoked by:\n"
 msgstr "將被撤銷:\n"
 
-#: g10/revoke.c:277
+#: g10/revoke.c:312
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(這是把機密的撤銷金鑰)\n"
 
-#: g10/revoke.c:281
+#: g10/revoke.c:316
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:294 g10/revoke.c:516
+#: g10/revoke.c:329 g10/revoke.c:554
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:308 g10/revoke.c:530
+#: g10/revoke.c:344 g10/revoke.c:568
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
 
-#: g10/revoke.c:371
+#: g10/revoke.c:407
 msgid "Revocation certificate created.\n"
 msgstr "已建立撤銷憑證.\n"
 
-#: g10/revoke.c:377
+#: g10/revoke.c:413
 #, c-format
 msgid "no revocation keys found for \"%s\"\n"
 msgstr "沒有找到 \"%s\" 用的撤銷金鑰\n"
 
-#: g10/revoke.c:433
+#: g10/revoke.c:471
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私鑰 \"%s\": %s\n"
 
-#: g10/revoke.c:462
+#: g10/revoke.c:500
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "沒有相對應的公鑰: %s\n"
 
-#: g10/revoke.c:473
+#: g10/revoke.c:511
 msgid "public key does not match secret key!\n"
 msgstr "公鑰與私鑰並不吻合!\n"
 
-#: g10/revoke.c:480
+#: g10/revoke.c:518
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:497
+#: g10/revoke.c:535
 msgid "unknown protection algorithm\n"
 msgstr "未知的保護演算法\n"
 
-#: g10/revoke.c:505
+#: g10/revoke.c:543
 msgid "NOTE: This key is not protected!\n"
 msgstr "注意: 這把金鑰沒有被保護!\n"
 
-#: g10/revoke.c:556
+#: g10/revoke.c:594
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5159,33 +5215,33 @@ msgstr ""
 "但是千萬小心: 妳的機器上的列印系統可能會在列印過\n"
 "程中把這些資料暫存在某個其他人也能夠看得到的地方!\n"
 
-#: g10/revoke.c:597
+#: g10/revoke.c:635
 msgid "Please select the reason for the revocation:\n"
 msgstr "請選擇撤銷的原因:\n"
 
-#: g10/revoke.c:607
+#: g10/revoke.c:645
 msgid "Cancel"
 msgstr "取消"
 
-#: g10/revoke.c:609
+#: g10/revoke.c:647
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(也許妳會想要在這裡選擇 %d)\n"
 
-#: g10/revoke.c:650
+#: g10/revoke.c:688
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "請輸入選用的描述; 以空白列結束:\n"
 
-#: g10/revoke.c:678
+#: g10/revoke.c:716
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "撤銷原因: %s\n"
 
-#: g10/revoke.c:680
+#: g10/revoke.c:718
 msgid "(No description given)\n"
 msgstr "(沒有給定描述)\n"
 
-#: g10/revoke.c:685
+#: g10/revoke.c:723
 msgid "Is this okay? (y/N) "
 msgstr "這樣可以嗎? (y/N) "
 
@@ -5335,25 +5391,25 @@ msgstr "檢查已建立的簽章時發生錯誤: %s\n"
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 簽章來自: \"%s\"\n"
 
-#: g10/sign.c:763
+#: g10/sign.c:767
 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:832
+#: g10/sign.c:836
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
-#: g10/sign.c:924
+#: g10/sign.c:934
 msgid "signing:"
 msgstr "簽署:"
 
-#: g10/sign.c:1036
+#: g10/sign.c:1046
 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:1214
+#: g10/sign.c:1224
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
@@ -5608,121 +5664,125 @@ msgstr "信任記錄 %lu 不是所請求的類別 %d\n"
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "無法使用未知的信任模型 (%d) - 現在採用 %s 信任模型\n"
 
-#: g10/trustdb.c:453
+#: g10/trustdb.c:454
 #, c-format
 msgid "using %s trust model\n"
 msgstr "正在使用 %s 信任模型\n"
 
-#: g10/trustdb.c:505
+#: g10/trustdb.c:456
+msgid "PKA verification is allowed to leverage trust to full\n"
+msgstr ""
+
+#: g10/trustdb.c:510
 msgid "10 translator see trustdb.c:uid_trust_string_fixed"
 msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 
-#: g10/trustdb.c:507
+#: g10/trustdb.c:512
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:509 g10/trustdb.c:514
+#: g10/trustdb.c:514 g10/trustdb.c:519
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
-#: g10/trustdb.c:513
+#: g10/trustdb.c:518
 msgid "[ unknown]"
 msgstr "[  未知  ]"
 
-#: g10/trustdb.c:515
+#: g10/trustdb.c:520
 msgid "[  undef ]"
 msgstr "[ 未定義 ]"
 
-#: g10/trustdb.c:516
+#: g10/trustdb.c:521
 msgid "[marginal]"
 msgstr "[  勉強  ]"
 
-#: g10/trustdb.c:517
+#: g10/trustdb.c:522
 msgid "[  full  ]"
 msgstr "[  完全  ]"
 
-#: g10/trustdb.c:518
+#: g10/trustdb.c:523
 msgid "[ultimate]"
 msgstr "[  徹底  ]"
 
-#: g10/trustdb.c:533
+#: g10/trustdb.c:538
 msgid "undefined"
 msgstr "未定義"
 
-#: g10/trustdb.c:534
+#: g10/trustdb.c:539
 msgid "never"
 msgstr "永遠不會"
 
-#: g10/trustdb.c:535
+#: g10/trustdb.c:540
 msgid "marginal"
 msgstr "勉強"
 
-#: g10/trustdb.c:536
+#: g10/trustdb.c:541
 msgid "full"
 msgstr "完全"
 
-#: g10/trustdb.c:537
+#: g10/trustdb.c:542
 msgid "ultimate"
 msgstr "徹底"
 
-#: g10/trustdb.c:577
+#: g10/trustdb.c:582
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2330
+#: g10/trustdb.c:588 g10/trustdb.c:2357
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
 
-#: g10/trustdb.c:592
+#: g10/trustdb.c:597
 #, c-format
 msgid "no need for a trustdb check with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:607
+#: g10/trustdb.c:612
 #, c-format
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:839 g10/trustdb.c:1277
+#: g10/trustdb.c:844 g10/trustdb.c:1282
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
 
-#: g10/trustdb.c:1034
+#: g10/trustdb.c:1039
 msgid "please do a --check-trustdb\n"
 msgstr "請做一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1038
+#: g10/trustdb.c:1043
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2074
+#: g10/trustdb.c:2100
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2138
+#: g10/trustdb.c:2165
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2152
+#: g10/trustdb.c:2179
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2175
+#: g10/trustdb.c:2202
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2261
+#: g10/trustdb.c:2288
 #, 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:2336
+#: g10/trustdb.c:2363
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -5958,6 +6018,11 @@ msgstr "已取消"
 msgid "no card"
 msgstr "沒有卡片"
 
+#: util/errors.c:111
+#, fuzzy
+msgid "no data"
+msgstr "沒有被簽署過的資料\n"
+
 #: util/logger.c:158
 msgid "ERROR: "
 msgstr "錯誤: "
@@ -6016,19 +6081,19 @@ msgstr "oO"
 msgid "cC"
 msgstr "cC"
 
-#: util/secmem.c:91
+#: util/secmem.c:97
 msgid "WARNING: using insecure memory!\n"
 msgstr "警告: 正在使用不安全的記憶體!\n"
 
-#: util/secmem.c:92
+#: util/secmem.c:98
 msgid "please see http://www.gnupg.org/faq.html for more information\n"
 msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
 
-#: util/secmem.c:344
+#: util/secmem.c:350
 msgid "operation is not possible without initialized secure memory\n"
 msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
 
-#: util/secmem.c:345
+#: util/secmem.c:351
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\n"
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 6d25f763e..f21de2dcd 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-14  Werner Koch  <[email protected]>
+
+	* autogen.sh (DIE): Add lost exit for --build-w32.
+
 2005-10-02  Marcus Brinkmann  <[email protected]>
 
 	* autogen.sh (DIE): Remove ugly hack for po dir suppression.
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 74df2b236..f132ce335 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -99,6 +99,7 @@ if test "$1" = "--build-w32"; then
 
     $tsdir/configure ${conf_CC} --build=${build} --host=${host} \
                 ${disable_foo_tests}  $*
+    exit $?
 fi
 
 
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index f9b7a0b61..3f687cafd 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -116,7 +116,7 @@ cp ${bindir}/g10/gpg.exe gpg.exe
 $STRIP gpg.exe
 cp ${bindir}/g10/gpgv.exe gpgv.exe
 $STRIP gpgv.exe
-for name in hkp http ldap finger; do 
+for name in hkp curl ldap finger; do 
   cp ${bindir}/keyserver/gpgkeys_$name.exe gpgkeys_$name.exe
   $STRIP gpgkeys_$name.exe
 done
diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi
index 4c0fa3882..e68e18eaa 100644
--- a/scripts/w32installer.nsi
+++ b/scripts/w32installer.nsi
@@ -370,7 +370,7 @@ Section "Uninstall"
   Delete "$INSTDIR\gpg.exe"
   Delete "$INSTDIR\gpgkeys_finger.exe"
   Delete "$INSTDIR\gpgkeys_hkp.exe"
-  Delete "$INSTDIR\gpgkeys_http.exe"
+  Delete "$INSTDIR\gpgkeys_curl.exe"
   Delete "$INSTDIR\gpgkeys_ldap.exe"
 
   Delete "$INSTDIR\Doc\README.txt"