1 files changed, 789 insertions, 720 deletions

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: gnupg-i18n@gnupg.org\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 <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\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 <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\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]"