Preparing a release candidate

author: Werner Koch <[email protected]> 2005-06-21 12:54:56 +0000
committer: Werner Koch <[email protected]> 2005-06-21 12:54:56 +0000
commit: 167d957f5df4e2c6d1b521b86e912734b6d065bf (patch)
tree: 4b575aeeeba3bc527cea8980bcf0344e1d6b3532
parent: * gpgkeys_hkp.c (append_path, send_key, get_key, search_key, main), (diff)
download: gnupg-167d957f5df4e2c6d1b521b86e912734b6d065bf.tar.gz
gnupg-167d957f5df4e2c6d1b521b86e912734b6d065bf.zip
29 files changed, 11893 insertions, 11113 deletions
diff --git a/ChangeLog b/ChangeLog
index accc42cb7..81eb422be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-21  Werner Koch  <[email protected]>
+
+	Released 1.4.2rc2.
+
 2005-06-20  David Shaw  <[email protected]>
 
 	* NEWS: Note key cleaning commands.
diff --git a/configure.ac b/configure.ac
index 950fa0745..e36ab6c71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.9.3"
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.4.2-cvs, [email protected])
+AC_INIT(gnupg, 1.4.2rc2, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/po/ChangeLog b/po/ChangeLog
index 28eda8d6f..550d06864 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-21  Werner Koch  <[email protected]>
+
+	* zh_TW.po: Updated.
+
+	* ro.po: Updated.
+
 2005-06-15  Werner Koch  <[email protected]>
 
 	* de.po: Some Typo fixes.
diff --git a/po/be.po b/po/be.po
index 27f7c5ff8..40ef32f42 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,7 +67,7 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -229,7 +229,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -370,7 +370,7 @@ msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr ""
@@ -434,7 +434,7 @@ msgstr ""
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
@@ -543,7 +543,7 @@ msgstr ""
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr ""
@@ -567,7 +567,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr ""
 
@@ -576,7 +576,7 @@ msgstr ""
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
@@ -655,47 +655,47 @@ msgstr "сакрэтны ключ недаступны"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -705,13 +705,13 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -893,27 +893,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
@@ -1128,15 +1128,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1146,7 +1146,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1154,489 +1154,489 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr ""
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -1644,26 +1644,26 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -1929,392 +1929,417 @@ msgstr "Даведка адсутнічае"
 msgid "No help available for `%s'"
 msgstr "Для \"%s\" даведка адсутнічае"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr ""
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr ""
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr ""
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr ""
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr ""
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
+
+#: g10/import.c:313
+#, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr ""
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "паказаць сьпіс ключоў і подпісаў"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "Ключ абаронены.\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -2338,51 +2363,51 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2390,244 +2415,244 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr ""
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Гэты ключ згубіў састарэў!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2635,173 +2660,177 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr ""
 
+#: g10/keyedit.c:1438
+msgid "clean unusable parts from key"
+msgstr ""
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2835,103 +2864,103 @@ msgstr ""
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
@@ -3045,15 +3074,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr ""
 
@@ -3070,7 +3097,7 @@ msgid ""
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
@@ -3113,181 +3140,181 @@ msgstr ""
 msgid "User ID \"%s\": already clean.\n"
 msgstr ""
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3607,7 +3634,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4303,34 +4330,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr ""
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4341,27 +4368,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Увядзіце пароль: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4371,17 +4398,17 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Паўтарыце пароль: "
 
@@ -5313,7 +5340,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -5341,32 +5368,32 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr ""
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5677,6 +5704,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "Ключ абаронены.\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "немагчыма адкрыць %s: %s\n"
 
diff --git a/po/ca.po b/po/ca.po
index fa24bf32b..dbd6ff8c6 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -51,7 +51,7 @@ msgstr "no s'ha trobat cap mòdul d'acumulació d'entropia\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -88,7 +88,7 @@ msgstr "no s'ha pogut llegir «%s»: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -262,7 +262,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -412,7 +412,7 @@ msgid "can't do this in batch mode\n"
 msgstr "no es pot fet això en mode desatès\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "La vostra selecció? "
@@ -480,7 +480,7 @@ msgstr "no hi ha cap clau pública corresponent: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -590,7 +590,7 @@ msgstr "   (%d) RSA (només xifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
@@ -615,7 +615,7 @@ msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ix del menú"
 
@@ -626,7 +626,7 @@ msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
@@ -704,51 +704,51 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -758,13 +758,13 @@ msgstr "no s'ha pogut obrir «%s»\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -967,27 +967,27 @@ msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el directori temporal «%s»: %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clau %08lX: no està protegida - es descarta\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
@@ -1208,15 +1208,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1231,7 +1231,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1239,478 +1239,478 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1718,28 +1718,28 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -1749,29 +1749,29 @@ msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
@@ -2139,255 +2139,285 @@ msgstr "No hi ha ajuda disponible"
 msgid "No help available for `%s'"
 msgstr "No hi ha ajuda disponible per a `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "es descarta un bloc de tipus %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "fins ara s'han processat %lu claus\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Nombre total processat: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " claus noves descartades: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                sense ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importades: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          no modificades: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       ID d'usuaris nous: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subclaus noves: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        signatures noves: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "       noves revocacions: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "claus privades importades: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claus privades no canviades: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importades: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        signatures noves: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr " claus privades llegides: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "clau %08lX: «%s» %d signatures noves\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "clau %08lX: «%s» %d signatures noves\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -2397,22 +2427,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -2420,132 +2450,126 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr ""
-"clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
@@ -2570,51 +2594,51 @@ msgstr "error en crear «%s»: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 signatura errònia\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures errònies\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures no comprovades per falta de clau\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Ha estat detectat 1 ID sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Han estat detectats %d IDs sense autosignatura vàlida\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2626,65 +2650,65 @@ msgstr ""
 "verificar les claus d'altres usuaris (mirant passaports,\n"
 "comprovant empremtes de diferents fonts...)?\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Hi confie marginalment\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Hi confie plenament\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID d'usuari «%s» no està autosignat."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2693,11 +2717,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voleu ascendir-la a una autosignatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2706,11 +2730,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Voleu crear una nova signatura per a reemplaçar la caducada? (s/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2719,54 +2743,54 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voleu ascendir-la a una signatura completament exportable? (s/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» ja estava signada localment amb la clau %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» ja estava signada amb la clau %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voleu signarla un altre cop, de tota manera? (s/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aquesta clau caducarà el %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voleu que la vostra signatura caduque alhora? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "No podeu fer una signatura OpenPGP en una clau PGP 2.x en el mode --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Açò inutilitzaria la clau en PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2776,32 +2800,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No vaig a contestar.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No ho he comprovat en absolut.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He fet algunes comprovacions.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) He fet comprovacions molt acurades.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seleccioneu una opció (introduïu «?» per obtindre més informació):"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2810,100 +2834,100 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVÍS: la signatura no es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a inexportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La signatura es marcarà com a irrevocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "No he comprovat aquesta clau en absolut.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "He fet algunes comprovacions a aquesta clau.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "He comprovat aquesta clau amb molta cura.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No es pot editar aquesta clau: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2911,11 +2935,11 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2924,65 +2948,65 @@ msgstr ""
 "\n"
 
 # No abusis dels pronoms!  (Rowan Atkinson @ Llei i Desordre)  ivb
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -2990,121 +3014,126 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "la clau secreta és inusable"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3139,114 +3168,114 @@ msgstr "La clau està revocada."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
@@ -3368,16 +3397,14 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3401,7 +3428,7 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
@@ -3448,11 +3475,11 @@ msgstr "No s'hi ha eliminat res.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3461,184 +3488,184 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3993,7 +4020,7 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4733,29 +4760,29 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versió %d del protocol de gpg-agent no està suportada\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "hi ha un problema amb l'agent: es deshabilitarà el seu ús\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -4771,7 +4798,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4782,28 +4809,28 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Repetiu la contrasenya\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "no es pot demanar la contrasenya en mode desatès\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4813,17 +4840,17 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repetiu la contrasenya: "
 
@@ -5852,7 +5879,7 @@ msgstr ""
 "no és necessària una comprovació de la base de dades de confiança\n"
 "\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la pròxima comprovació de la base de dades de confiança serà el %s\n"
@@ -5884,33 +5911,33 @@ msgstr "si us plau, feu un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "s'està comprovant la base de dades de confiança\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "no s'han trobat claus amb confiança absoluta\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "no s'ha trobat la clau pública de la clau amb confiança absoluta %08lX\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registre de confiança %lu, tipus %d: no s'ha pogut escriure: %s\n"
@@ -6247,6 +6274,11 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr ""
+#~ "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "no s'ha pogut executar %s «%s»: %s\n"
 
diff --git a/po/cs.po b/po/cs.po
index a2d0e5218..2e121f904 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -29,7 +29,7 @@ msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -65,7 +65,7 @@ msgstr "nemohu ��st `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -241,7 +241,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "ve�ejn� RSA exponent je p��li� dlouh� (v�ce ne� 32 bit�)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -383,7 +383,7 @@ msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "V� v�b�r? "
@@ -446,7 +446,7 @@ msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -550,7 +550,7 @@ msgstr "   (2) �ifrovac� kl��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
@@ -571,7 +571,7 @@ msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
@@ -579,7 +579,7 @@ msgstr "ukon�it toto menu"
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
@@ -651,11 +651,11 @@ msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -664,41 +664,41 @@ msgstr ""
 "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
 "'z': "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -708,13 +708,13 @@ msgstr "nelze otev��t `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -904,26 +904,26 @@ msgstr "VAROV�N�: nelze smazat do�asn� soubor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROV�N�: nelze smazat do�asn� adres�� `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "exportov�n� tajn�ho kl��e nen� povoleno\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kl�� %s: nen� chr�n�n� - p�esko�eno\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kl�� %s: PGP 2.x kl�� - p�esko�eno\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROV�N�: tajn� kl�� %s nen� chr�n�n pomoc� simple SK checksum\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
@@ -1139,17 +1139,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <[email protected]>.\n"
 "P�ipom�nky k p�ekladu <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1159,7 +1159,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1167,79 +1167,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1247,21 +1247,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1269,7 +1269,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1277,376 +1277,376 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1654,28 +1654,28 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -1683,27 +1683,27 @@ msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
 # c-format
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m sekund�rn� kl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
@@ -2069,399 +2069,424 @@ msgstr "Pomoc nen� k dispozici"
 msgid "No help available for `%s'"
 msgstr "Pomoc nen� dostupn� pro '%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d byl p�esko�en\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kl��e byly doposud zpracov�ny\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkov� po�et zpracovan�ch kl���: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      p�esko�eny nov� kl��e: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identifik�tor� (user ID): %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importov�no: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             beze zm�n: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nov� id u�ivatel� (user ID): %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nov� podkl��e: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nov� podpisy: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nov� revokace kl���: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      p�e�ten� tajn� kl��e: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  importovan� tajn� kl��e: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "tajn� kl��e nezm�n�ny: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportov�no: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        nov� podpisy: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      p�e�ten� tajn� kl��e: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "VAROV�N�: kl�� %s obsahuje preference pro algoritmy,\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "kter� nesjou k dispozici. T�k� se to t�chto user ID:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preference pro �ifrovac� algortimus %s\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preference pro podepisovac� algoritmus %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preference pro komprima�n� algoritmus %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporu�ujeme aktualiaci nastaven� va�ich preferenc� a\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto kl��e aby jste p�ede�el probl�m�m s neshodou algoritm�\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat preference s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "kl�� %s: chyb� identifik�tor u�ivatele\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kl�� %s: PKS po�kozen� podkl��e opraveno\n"
 
 # c-format
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kl�� %s: p�ijat id u�ivatele \"%s\",kter� nen� podeps�n j�m sam�m\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kl�� %s: chyb� platn� identifik�tor u�ivatele\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to b�t zp�sobeno chyb�j�c�m podpisem kl��e j�m sam�m\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kl�� %s: ve�ejn� kl�� nenalezen: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kl�� %s: nov� kl�� - p�esko�en\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor kl��� (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kl�� %s: ve�ejn� kl�� \"%s\" importov�n\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kl�� %s: neodpov�d� na�� kopii\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kl�� %s: nemohu naj�t origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kl�� %s: nemohu ��st origin�ln� blok kl��e: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kl�� %s: \"%s\" 1 nov� identifik�tor u�ivatele\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kl�� %s: \"%s\" 1 nov� podkl��\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kl�� %s: \"%s\" %d nov�ch podkl���\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch podpis�\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "kl�� %s: \"%s\" %d nov�ch identifik�tor� u�ivatele\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kl�� %s: \"%s\" beze zm�n\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kl�� %s: tajn� kl�� s neplatnou �ifrou %d - p�esko�eno\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "import tajn�ch kl��� nen� povolen\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nen� nastaven implicitn� soubor tajn�ch kl��� %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kl�� %s: tajn� kl�� importov�n\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kl�� %s: je ji� v souboru tajn�ch kl���\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kl�� %s: nenalezen tajn� kl��: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "kl�� %s: chyb� ve�ejn� kl�� - nemohu aplikovat revoka�n� certifik�t\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - zam�tnuto\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kl�� %s: \"%s\" revoka�n� certifik�t importov�n\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kl�� %s: neexistuje id u�ivatele pro podpis\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e u u�ivatelsk�ho id  \"%s"
 "\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kl�� %s neplatn� podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kl�� %s: neexistuje podkl�� pro v�z�n� kl���\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kl�� %s: nepodporovan� algoritmus ve�ejn�ho kl��e\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kl�� %s: neplatn� vazba podkl��e\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� vazba podkl��e\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kl�� %s: neexistuje podkl�� pro revokaci kl��e\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kl�� %s: neplatn� revoka�n� podkl��\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kl�� %s: smaz�na v�cen�sobn� revokace podkl��e\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kl�� %s: p�esko�en identifik�tor u�ivatele \"%s\"\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kl�� %s: podkl�� p�esko�en\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kl�� %s: podpis nen� exportovateln� (t��da %02X) - p�esko�eno\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kl�� %s: revoka�n� certifik�t na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kl�� %s: neplatn� revoka�n� certifik�t: %s - p�esko�en\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kl�� %s: podpis podkl��e na �patn�m m�st� - p�esko�eno \n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kl�� %s: objeven duplikovan� identifik�tor u�ivatele - slou�en\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROV�N�: kl�� %s m��e b�t revokov�n: zkou��m z�skat revoka�n� kl�� %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROV�N�: kl�� %s m��e b�t revokov�n: revoka�n� kl�� %s nenalezen.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kl�� %s: \"%s\" p�id�n revoka�n� certifik�t\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kl�� %s: podpis kl��e j�m sam�m (direct key signature) p�id�n\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
@@ -2486,51 +2511,51 @@ msgstr "chyba p�i vytv��en� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revokace]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis� neov��en�ch, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "objeven 1 identifik�tor u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "objeveno %d identifik�tor� u�ivatele bez platn�ho podpisu j�m sam�m\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2542,17 +2567,17 @@ msgstr ""
 "kontrolou fingerprint� z r�zn�ch zdroj�...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�v��uji ��ste�n�\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�v��uji �pln�\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2562,48 +2587,48 @@ msgstr ""
 "Hloubka v�t�� ne� 1 umo��uje kl���m, kter� jste podepsal\n"
 "podepsat jin� kl��, kter� bude pro V�s d�v�ryhodn�.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Pros�m vlo�te dom�nu, pro kterou je podpis omezen nebo stiskn�te enter pro "
 "podpis bez omezen� na dom�nu.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jist�(�), �e st�le chcete podepsat tento kl��? (a/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypr�ela platnost u�ivatelsk�ho ID \"%s\"."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u�ivatele \"%s\" nen� podeps�no j�m sam�m."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2612,11 +2637,11 @@ msgstr ""
 "Podpis kl��e \"%s\" j�m sam�m je\n"
 "podpis form�tu PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2626,13 +2651,13 @@ msgstr ""
 "vypr�ela.\n"
 "\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Chcete vytvo�it nov� podpis a nahradit j�m ten, jeho� platnost vypr�ela? (a/"
 "N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2642,54 +2667,54 @@ msgstr ""
 "je pouze lok�ln�.\n"
 "\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "P�ejete si jej zm�nit na pln� exportovateln� podpise? (a/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je ji� lok�ln� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je ji� podeps�n kl��em %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Chcete kl�� p�esto znova podepsat? (a/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nic k podeps�n� kl��em %s\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Platnost kl��e vypr�ela!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnost kl��e vypr�� %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnost Va�eho podpisu vypr�ela ve stejnou dobu? (A/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete ud�lat OpenPGP podpis kl��e typu PGP 2.x, kdy� jste v --pgp2 m�du.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by zp�sobilo nepou�itelnost kl��e v PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2699,32 +2724,32 @@ msgstr ""
 "pat�� v��e uveden� osob�.\n"
 "Pokud nezn�te odpov��, zadejte \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpov�m.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nijak jsem to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��ste�n� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Velmi pe�liv� jsem to ov��il(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Va� v�b�r? (pro detailn�j�� informace stiskn�t� '?'):"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2733,75 +2758,75 @@ msgstr ""
 "Jste si jist�(�), �e chcete podepsat tento kl��\n"
 "sv�m kl��em \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "VAROV�N�: podpis nebude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Podpis bude ozna�en jako neexportovateln�.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Podpis bude ozna�en jako neodvolateln� (non-revocable).\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Nijak jsem tento kl�� neov��il.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "��ste�n� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Velmi pe�liv� jsem ov��il tento kl��.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? (a/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podeps�n� selhalo: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��sti prim�rn�ho kl��e nejsou dostupn�.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nen� mo�n� editovat tento kl��: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2809,11 +2834,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2821,175 +2846,180 @@ msgstr ""
 "Nechcete heslo - to *nen�* dobr� n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete ud�lat? (a/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "p�esunuji podpis kl��e na spr�vn� m�sto\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ulo�it a ukon�it"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vypsat fingerprint"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vypsat seznam kl��� a id u�ivatel�"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u�ivatele N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revokovat podpisy"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "p�idat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "p�idat fotografick� ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "smazat identifik�tor u�ivatele"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "p�esunout kl�� na kartu"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "smazat sekund�rn� kl��"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "p�idat revoka�n� kl��"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�it u�ivatelsk� ID jako prim�rn�"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "p�epnout mezi vyps�n�m seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "vypsat seznam p�edvoleb (pro experty)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam p�edvoleb (podrobn�)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL pro preferovan� server kl���"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "zm�nit heslo"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "zm�nit d�v�ryhodnost vlastn�ka kl��e"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "odvolat platnost id u�ivatele"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokovat sekund�rn� kl��"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "nastavit kl�� jako platn� (enable)"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "nastavit kl�� jako neplatn� (disable)"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�zat fotografick� ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "nepou�iteln� tajn� kl��"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3023,105 +3053,105 @@ msgstr "Kl�� revokov�n."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�m� t��da podpisu"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu p�esunout prim�rn� kl��? (a/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat pr�v� jeden kl��.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? (a/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat v�echny vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� kl��e? (a/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento kl��? (a/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "D�v�ryhodnost vlastn�ka nelze m�nit je-li pou��v�na datab�ze d�v�ry "
 "poskytnut� u�ivatelem\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam p�edvoleb:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? (a/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? (a/N) "
 
@@ -3236,15 +3266,13 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "platnost skon�ila"
 
@@ -3265,7 +3293,7 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
@@ -3308,12 +3336,12 @@ msgstr "Nic nebylo smaz�no.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� zp�sob reprezentace v ASCII"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3322,172 +3350,172 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� 'pov��en� revokace' m��e v n�kter�ch\n"
 "          verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nem�li by jste p�id�vat 'pov��en� revokace' k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kl�� form�tu PGP 2.x nelze pov��it revokac�\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kl�� nelze pov��it revokac� j�m sam�m\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento kl�� ji� bykl pov��en revokac�\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanoven� kl��e 'pov�en�m revok�torem' je nevratn� operace!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jist�, �e tento kl�� chcete pov��it revokac�? (a/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstra�te v�b�r z tajn�ch kl���.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zm�nit dobu platnosti kl��e verze 3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "p�esko�en v3 podpis kl��e j�m sam�m u u�ivatelsk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete p�epsat? (a/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele:\"%s\"\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podeps�no va��m kl��em %s v %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le revokovat? (a/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvo�it pro tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele: %s:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (nerevokovateln�)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokov�no va��m kl��em %s v %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID u�ivatele je datov�n %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografick� ID o velikosti %ld pro kl�� %s (uid %d)\n"
@@ -3832,7 +3860,7 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4545,34 +4573,34 @@ msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verze %d nen� podporov�n\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4583,28 +4611,28 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Opakovat heslo\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4613,17 +4641,17 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -5609,7 +5637,7 @@ msgstr "absolutn�"
 msgid "no need for a trustdb check\n"
 msgstr "nen� nutn� kontrolovat datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�� kontrola datab�ze d�v�ry v %s\n"
@@ -5637,26 +5665,26 @@ msgstr "pros�m prove�te --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontroluji datab�zi d�v�ry\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "zpracov�no %d kl��� (%d validit vymaz�no)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "��dn� absolutn� d�v�ryhodn� kl�� nebyl nalezen\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ve�ejn� kl�� k absolutn� d�v�ryhodn�mu kl��i %s nebyl nalezen\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "po�adov�no %d ��ste�n� d�v�ry a %d �pln� d�v�ry, model %s\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5664,7 +5692,7 @@ msgstr ""
 "hloubka: %d  platn�ch: %3d  podepsan�ch: %3d  d�v�ra: %d-, %dq, %dn, %dm, %"
 "df, %du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "nelze aktualizovat z�znam v datab�zi d�v�ry: chyba p�i z�pisu: %s\n"
@@ -5975,6 +6003,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "kl�� %s: neo�ek�van� podpisov� t��da (0x%02X) - p�esko�eno\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "nelze spustit program `%s': %s\n"
 
diff --git a/po/da.po b/po/da.po
index 979ca6e3d..20e299351 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -32,7 +32,7 @@ msgstr ""
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,7 +68,7 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, fuzzy, c-format
@@ -240,7 +240,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -383,7 +383,7 @@ msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Dit valg? "
@@ -450,7 +450,7 @@ msgstr "skriver offentligt certifikat til '%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -563,7 +563,7 @@ msgstr "   (%d) ElGamal (krypt�r kun)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
@@ -588,7 +588,7 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
@@ -597,7 +597,7 @@ msgstr "afslut denne menu"
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
@@ -677,51 +677,51 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -731,13 +731,13 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -919,27 +919,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
@@ -1156,16 +1156,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1175,7 +1175,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1183,507 +1183,507 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "RSA n�gle kan ikke bruges i denne version\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1692,27 +1692,27 @@ msgstr "den givne politik-URL er ugyldig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
@@ -1981,393 +1981,418 @@ msgstr "Ingen hj�lp tilg�ngelig"
 msgid "No help available for `%s'"
 msgstr "Ingen hj�lp tilg�ngelig for `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "sprang over blok af typen %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu n�gler behandlet indtil nu\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Totalt antal behandlede: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              u�ndrede: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nye bruger-id'er: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nye undern�gler: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        nye signaturer: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nye n�gletilbagekald: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "hemmelige n�gler u�ndre: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "           importerede: %lu"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        nye signaturer: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr " hemmelige n�gler l�st: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "n�gle %08lX: ingen bruger-id\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "n�gle %08lX: ingen bruger-id\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -2392,51 +2417,51 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr ""
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2444,435 +2469,440 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Bem�rk: Denne n�gle er for�ldet!\n"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
 "key \"%s\" (%s)\n"
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan ikke redigere denne n�gle: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr ""
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "d�rlig hemmelig n�gle"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2908,112 +2938,112 @@ msgstr "N�glen er beskyttet.\n"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
@@ -3128,16 +3158,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
@@ -3155,7 +3183,7 @@ msgid ""
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
@@ -3199,192 +3227,192 @@ msgstr ""
 msgid "User ID \"%s\": already clean.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3716,7 +3744,7 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4425,34 +4453,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4460,29 +4488,29 @@ msgid ""
 "%u-bit %s key, ID %s, created %s%s\n"
 msgstr ""
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr ""
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4491,17 +4519,17 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -5464,7 +5492,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr ""
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr ""
@@ -5493,32 +5521,32 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5832,6 +5860,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan have brugt et forkert program til denne opgave)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "kan ikke �bne %s: %s\n"
 
diff --git a/po/de.po b/po/de.po
index 774c86437..4156aace0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2005-06-15 10:51+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -31,7 +31,7 @@ msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -57,7 +57,8 @@ msgstr "Hinweis: 'random_seed'-Datei ist leer\n"
 #: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: invalid size of random_seed file - not used\n"
-msgstr "WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
+msgstr ""
+"WARNUNG: Falsche Gr��e der 'random_seed'-Datei - sie wird nicht verwendet\n"
 
 #: cipher/random.c:416
 #, c-format
@@ -68,7 +69,7 @@ msgstr "'%s' ist unlesbar: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -239,7 +240,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "der �ffentliche Exponent ist zu gro� (mehr als 32 Bit)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -380,7 +381,7 @@ msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
@@ -444,7 +445,7 @@ msgstr "URL um den �ffentlichen Schl�ssel zu holen: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze betr�gt %d Zeichen).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
@@ -550,7 +551,7 @@ msgstr "   (2) Verschl�sselungs-Schl�ssel\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schl�ssel\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
@@ -571,7 +572,7 @@ msgstr "Geheime Teile des Schl�ssels sind nicht vorhanden\n"
 msgid "secret key already stored on a card\n"
 msgstr "geheimer Schl�ssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
@@ -579,7 +580,7 @@ msgstr "Men� verlassen"
 msgid "show admin commands"
 msgstr "Zeige Admin-Kommandos"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
@@ -651,13 +652,13 @@ msgstr "Admin-Befehle sind nicht erlaubt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Legen Sie die Karte ein und dr�cken Sie 'Eingabe'; dr�cken Sie 'c' um "
 "abzubrechen: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -667,36 +668,36 @@ msgstr ""
 "Seriennummer ein:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Dr�cken Sie 'Eingabe' wenn fertig; oder dr�cken Sie 'c' um abzubrechen: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "Geben Sie die neue Admin-PIN ein: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "Geben Sie die neue PIN ein: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Geben Sie die Admin-PIN ein: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "Geben Sie die PIN ein: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "Geben Sie die PIN nochmal ein: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -706,13 +707,13 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -914,27 +915,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "WARNUNG: Tempor�res Verzeichnis `%s' kann nicht entfernt werden: %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "Exportieren geheimer Schl�ssel ist nicht erlaubt\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "Schl�ssel %s: ungesch�tzt - �bersprungen\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schl�ssel %s: PGP 2.x-artiger Schl�ssel - �bersprungen\n"
 
 # translated by wk
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "WARNUNG: Der geheime Schl�ssel %s hat keine einfache SK-Pr�fsumme\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
@@ -1149,17 +1150,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1169,7 +1170,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1177,73 +1178,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis `%s'\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis auf die Erweiterung `%s'\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses f�r Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1251,20 +1252,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1272,392 +1273,392 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige Schl�sselserver-Option\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import-Option\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import-Option\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export-Option.\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "Ung�ltige Export-Option\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Listen-Option.\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "Ung�ltige Listen-Option\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "Ung�ltige �berpr�fungs-Option\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ung�ltiger \"default-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ung�ltiger \"min-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1665,28 +1666,28 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -1695,29 +1696,29 @@ msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %s, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschl�ssel zum �ffentlichen Unterschl�ssel %s - "
 "�bergangen\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Zweitschl�ssel %s wird anstelle des Hauptschl�ssels %s verwendet\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -1904,9 +1905,12 @@ msgid ""
 "\n"
 "If you don't know what the right answer is, answer \"0\"."
 msgstr ""
-"Wenn Sie die User-ID eines Schl�ssels beglaubigen wollen, sollten Sie zun�chst\n"
-"sicherstellen, da� der Schl�ssel demjenigen geh�rt, der in der User-ID genannt\n"
-"ist. F�r Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung �berpr�ft\n"
+"Wenn Sie die User-ID eines Schl�ssels beglaubigen wollen, sollten Sie "
+"zun�chst\n"
+"sicherstellen, da� der Schl�ssel demjenigen geh�rt, der in der User-ID "
+"genannt\n"
+"ist. F�r Dritte ist es hilfreich zu wissen, wie gut diese Zuordnung "
+"�berpr�ft\n"
 "wurde.\n"
 "\n"
 "\"0\" zeigt, da� Sie keine bestimmte Aussage �ber die Sorgfalt der \n"
@@ -1970,7 +1974,8 @@ msgid ""
 "know which key was used because this signing key might establish\n"
 "a trust connection through another already certified key."
 msgstr ""
-"Diese Beglaubigung kann nicht gepr�ft werden, da Sie den passenden Schl�ssel\n"
+"Diese Beglaubigung kann nicht gepr�ft werden, da Sie den passenden "
+"Schl�ssel\n"
 "nicht besitzen. Sie sollten die L�schung der Beglaubigung verschieben, bis\n"
 "sie wissen, welcher Schl�ssel verwendet wurde. Denn vielleicht w�rde genau\n"
 "diese Beglaubigung den \"Trust\"-Weg komplettieren."
@@ -2086,415 +2091,439 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "              ignorierte neue Schl�ssel: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                           ohne User-ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                             importiert: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                            unver�ndert: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                          neue User-IDs: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                    neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                        neue Signaturen: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "                neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "             gelesene geheime Schl�ssel: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "           geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "                 unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                       nicht importiert: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "                        neue Signaturen: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "             gelesene geheime Schl�ssel: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, fuzzy, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schl�ssel %s: Keine User-ID\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schl�ssel %s: PKS Unterschl�sseldefekt repariert\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schl�ssel %s: Nicht eigenbeglaubigte User-ID `%s' �bernommen\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schl�ssel %08lX: neuer Schl�ssel - �bersprungen\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schl�sselbund gefunden: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel \"%s\" importiert\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: %"
 "s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schl�ssel %08lX: \"%s\" 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schl�ssel %08lX: \"%s\" %d neue Unterschl�ssel\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "Schl�ssel %08lX: \"%s\" %d neue Signaturen\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "Schl�ssel %08lX: \"%s\" %d neue User-IDs\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schl�ssel %08lX: \"%s\" Nicht ge�ndert\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: geheimer Schl�ssel mit ung�ltiger Verschl�sselung %d - "
 "�bersprungen\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schl�sselbund: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren f�r User-ID \"%s"
 "\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung f�r User-ID \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselanbindungs-"
 "Beglaubigung\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung entfernt\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Unterschl�sselwiderruf-"
 "Beglaubigung\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schl�ssel %08lX: Ung�ltiger Unterschl�sselwiderruf\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "Schl�ssel %08lX: Mehrfacher Unterschl�ssel-Widerruf-Beglaubigung entfernt\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schl�ssel %08lX: User-ID �bergangen '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: Nicht exportf�hige Unterschrift (Klasse %02x) - �bergangen\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr ""
-"Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: hole Widerrufschl�ssel %08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schl�ssel %08lX ist u.U. widerrufen: Widerrufschl�ssel %08lX ist "
 "nicht vorhanden\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schl�ssel %08lX: \"%s\" Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schl�ssel %08lX: \"direct-key\"-Signaturen hinzugef�gt\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
@@ -2519,51 +2548,51 @@ msgstr "Fehler beim Erstellen von `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schl�sselbund-Cache konnte nicht neu erzeugt werden: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2577,17 +2606,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Ich vertraue ihm marginal\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Ich vertraue ihm vollst�ndig\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2597,48 +2626,48 @@ msgstr ""
 "Eine Tiefe gr��er 1 erlaubt dem zu unterschreibenden Schl�ssel\n"
 "Trust-Signatures f�r Sie zu machen.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Geben Sie bitte eine Domain ein, um die Unterschrift einzuschr�nken,\n"
 "oder nur die Eingabetaste f�r keine Domain\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2647,11 +2676,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Soll sie zu einer OpenPGP Eigenbeglaubigung ge�ndert werden? (j/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2660,13 +2689,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Soll eine neue Beglaubigung als Ersatz f�r die abgelaufene erstellt werden? "
 "(J/n) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2675,44 +2704,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur f�r diesen Rechner g�ltig.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Soll sie zu einer voll exportierbaren Beglaubigung erhoben werden? (j/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX lokal beglaubigt\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" wurde bereits durch Schl�ssel %08lX beglaubigt\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Wollen Sie ihn immer noch wieder beglaubigen? (j/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Dieser Schl�ssel ist verfallen!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Dieser Schl�ssel wird %s verfallen.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soll Ihre Beglaubigung zur selben Zeit verfallen? (J/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2720,11 +2749,11 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln unterschrieben "
 "werden\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Dies w�rde den Schl�ssel f�r PGP 2.x unbrauchbar machen\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2734,33 +2763,33 @@ msgstr ""
 "wollen, wirklich der o.g. Person geh�rt?\n"
 "Wenn Sie darauf keine Antwort wissen, geben Sie \"0\" ein.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ich habe es �berhaupt nicht �berpr�ft.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ich habe es fl�chtig �berpr�ft.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ich habe es sehr sorgf�ltig �berpr�ft.%s\n"
 
 # translated by wk
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ihre Auswahl? ('?' f�r weitere Informationen): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2769,14 +2798,14 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2784,85 +2813,85 @@ msgstr ""
 "WARNUNG: Die Unterschrift wird nicht als nicht-exportierbar markiert "
 "werden.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird nicht als nicht-widerrufbar markiert werden.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Die Unterschrift wird als nicht exportf�hig markiert werden.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel �berhaupt nicht �berpr�ft.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel fl�chtig �berpr�ft.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ich habe diesen Schl�ssel sehr sorgf�ltig �berpr�ft.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschl�ssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2870,11 +2899,11 @@ msgstr ""
 "Geben Sie die neue Passphrase f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2882,177 +2911,182 @@ msgstr ""
 "Sie wollen keine Passphrase - dies ist *nicht* zu empfehlen!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "Schl�ssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "Signaturen widerrufen"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "Den Schl�ssel nur f�r diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzuf�gen"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "Einen Widerrufschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (f�r Experten)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausf�hrlich)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "Die Passphrase �ndern"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "Eine User-ID widerrufen"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "Einen Zweitschl�ssel widerrufen"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "Schl�ssel anschalten"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "Schl�ssel abschalten"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "Foto-ID anzeigen"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "unbrauchbarer geheimer Schl�ssel"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3087,113 +3121,113 @@ msgstr "Schl�ssel wurde widerrufen."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannte Unterschriftenklasse"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieses Kommando ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fehler beim Erzeugen des Schl�sselbundes `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "M�chten Sie die Voreinstellungen der ausgew�hlten User-IDs wirklich �ndern? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
@@ -3309,16 +3343,14 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3342,7 +3374,7 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzuf�gen? (j/N) "
 
@@ -3385,11 +3417,11 @@ msgstr "Nichts entfernt.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
 msgstr "ung�ltig"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3399,37 +3431,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie k�nnen einem PGP2-artigen Schl���sel keine vorgesehenen Widerrufer "
 "hinzuf�gen.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schl�ssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schl�ssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schl�ssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schl�ssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht r�ckgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3437,146 +3469,146 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�berspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch %08lX um %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs beglaubigt:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Unterschrift datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3924,7 +3956,7 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4648,35 +4680,35 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent-Protokoll-Version %d wird nicht unterst�tzt\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 "Schwierigkeiten mit dem Agenten - Agent-Ansteuerung wird abgeschaltet\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4687,28 +4719,28 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schl�ssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Geben Sie die Passphrase nochmal ein\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Geben Sie die Passphrase ein: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4718,17 +4750,17 @@ msgstr ""
 "Sie ben�tigen eine Passphrase, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Geben Sie die Passphrase nochmal ein: "
 
@@ -5769,7 +5801,7 @@ msgstr "uneingeschr�nkt"
 msgid "no need for a trustdb check\n"
 msgstr "\"Trust-DB\"-�berpr�fung nicht n�tig\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "n�chste \"Trust-DB\"-Pflicht�berpr�fung am %s\n"
@@ -5799,33 +5831,33 @@ msgid "checking the trustdb\n"
 msgstr "\"Trust-DB\" wird �berpr�ft\n"
 
 # translated by wk
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d Schl�ssel verarbeitet (%d Validity Z�hler gel�scht)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "kein uneingeschr�nkt vertrauensw�rdiger Schl�ssel %08lX gefunden\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�ff.Schl�ssel des uneingeschr�nkt vertrautem Schl�ssel %08lX nicht gefunden\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d marignal-needed, %d complete-needed, %s Trust-Modell\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6142,6 +6174,11 @@ msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr ""
+#~ "Schl�ssel %08lX: unerwartete Unterschriftenklasse (0x%02x) - �bergangen\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "Ausf�hren des Programms `%s' nicht m�glich: %s\n"
 
diff --git a/po/el.po b/po/el.po
index 8005be796..32edb3850 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr "��� ����������� ������� �������� ���������\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,7 +68,7 @@ msgstr "�������� ��������� ��� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -241,7 +241,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -386,7 +386,7 @@ msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "� ������� ���; "
@@ -454,7 +454,7 @@ msgstr "������ ��������� ������� ������: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -565,7 +565,7 @@ msgstr "   (%d) RSA (��� ������������� ����)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
@@ -590,7 +590,7 @@ msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
@@ -599,7 +599,7 @@ msgstr "����������� ����� ��� �����"
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
@@ -679,48 +679,48 @@ msgstr "������� ��� �������� �������� ��� `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,13 +730,13 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -937,27 +937,27 @@ msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�������������: �������� ��������� ���������� ������� `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "������ %08lX: ��� ����� ������������� - ������������\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "������ %08lX:  ������ ����� PGP 2.x - ������������\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�������������: �� ������� ������ %08lX ��� ���� ���� SK checksum\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
@@ -1172,15 +1172,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1190,7 +1190,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1198,481 +1198,481 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1680,28 +1680,28 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1710,28 +1710,28 @@ msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -2094,405 +2094,430 @@ msgstr "��� ������� ��������� �������"
 msgid "No help available for `%s'"
 msgstr "��� ������� ��������� ������� ��� `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��������� �������� ��� ����� %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ������� ����� ����� ���� ������������\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "��������� ������� ��� ��������������: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ��� ������� ��� �������������: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ����� user ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              ����������: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             ����������: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          ��� user ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           ��� ����������: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        ���� ���������: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   ���� ���������� ��������: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ���������� ������� �������: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " ���������� ������� �������: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ��  ����������: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        ���� ���������: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      ����������� ������� �������: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
@@ -2517,51 +2542,51 @@ msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[��������]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 user ID ����������� ����� ������ ����-��������\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d user ID ������������ ����� ������� ����-���������\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2574,63 +2599,63 @@ msgstr ""
 "�� �������� passports ��� fingerprints ��� �������� �����...);\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = ��� ������ �����������\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = ��� ����� �����������\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�� user ID \"%s\" ���� �����."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�������������: �� user ID \"%s\" ��� ���� ����-���������."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2639,11 +2664,11 @@ msgstr ""
 "� ����-�������� ��� \"%s\"\n"
 "����� ��� �������� ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� OpenPGP ����-��������; (y/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2652,12 +2677,12 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "���� �����.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "������ �� ������� ��� ��� �������� ���� ������������� ��� ��������; (y/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2666,43 +2691,43 @@ msgstr ""
 "� ������������ �������� ��� ��� \"%s\"\n"
 "����� ��� ������ ��������.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "������ �� �� �������� �� ��� ����� ��������� ��������; (y/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ��� ����������� ��� �� ������ %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "������� ������ ����� �� �� ��������������; (y/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "������ ��� �� ��������� �� �� ������  %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "���� �� ������ ���� �����!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���� �� ������ �������� �� ����� ���� %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "������ � ���������� �� ����� ����������;  (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2710,11 +2735,11 @@ msgstr ""
 "�������� �� ��������������� ��� OpenPGP �������� �� ��� PGP 2.x ���� �� "
 "��������� --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���� �� ����� �� ������ ������� �� �� PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2724,32 +2749,32 @@ msgstr ""
 "������ �������� ��� ����������� �����; ��� ��� ������ �� �� ���������� "
 "�������\"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) ��� ������.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) ��� ��� ������� �������.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ��� ����� ��� ������ ������.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��� ����� ���������� ������.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "� ������� ���; (�������������� ? ��� �����������): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2758,21 +2783,21 @@ msgstr ""
 "������� ������ �� ���������� ���� �� ������\n"
 "�� �� ������ ���: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "�������������: � �������� �� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2780,14 +2805,14 @@ msgstr ""
 "�������������: � �������� �� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "� �������� �� ��������� ��� ��-���������.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2795,65 +2820,65 @@ msgstr ""
 "� �������� �� ��������� ��� ��-�����������.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "��� ��� ������� ������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "��� ����� ����������� ������ �� ���� �� ������.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "��� ������� ���� ���������� ���� �� ������.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "������� � ����������� ����� ��� ��������:%s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2861,187 +2886,192 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
 msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "�� ��������������� ������� ������"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3076,114 +3106,114 @@ msgstr "�� ������ ����������."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
@@ -3301,16 +3331,14 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3332,7 +3360,7 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
@@ -3375,12 +3403,12 @@ msgstr "������ ��� �����������.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3390,38 +3418,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3429,146 +3457,146 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
@@ -3918,7 +3946,7 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4644,34 +4672,34 @@ msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "��� ������������� � ������ ����������� %d ��� gpg-agent\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "�������� �� ��� agent - �������������� ��� ������ ��� agent\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4683,28 +4711,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "����������� �� �����\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "�������������� �� ����� ������: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4714,17 +4742,17 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "����������� �� ����� ������: "
 
@@ -5738,7 +5766,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "��� ������� ������ ��� ������ ��� trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "�������� ������� ��� trustdb �� ����� ���� %s\n"
@@ -5766,33 +5794,33 @@ msgstr "�������� ����� ��� --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "������� ��� trustdb\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ������� �������������� (%d ��������� ����������� �������)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "�� �������� ������� ������������ �������\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "�� ������� �� ������� ������ ��� ������� ������������� �������� %08lX\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "������� trust %lu, ����� %d: write �������: %s\n"
@@ -6106,6 +6134,11 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr ""
+#~ "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
diff --git a/po/eo.po b/po/eo.po
index c6ab11c93..2e50f4825 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr ""
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,7 +67,7 @@ msgstr "ne povas legi '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -238,7 +238,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -383,7 +383,7 @@ msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Via elekto? "
@@ -451,7 +451,7 @@ msgstr "skribas publikan �losilon al '%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -562,7 +562,7 @@ msgstr "   (%d) RSA (nur �ifri)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
@@ -587,7 +587,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:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
@@ -596,7 +596,7 @@ msgstr "forlasi �i tiun menuon"
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
@@ -676,51 +676,51 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,13 +730,13 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -922,27 +922,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "�losilo %08lX: ne protektita - ignorita\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, 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:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
@@ -1157,15 +1157,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1175,7 +1175,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1183,476 +1183,476 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, 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/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1661,29 +1661,29 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1692,27 +1692,27 @@ msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, 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:2235
+#: g10/getkey.c:2237
 #, 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:2466
+#: g10/getkey.c:2468
 #, 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:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -2065,395 +2065,420 @@ msgstr "Nenia helpo disponata"
 msgid "No help available for `%s'"
 msgstr "Nenia helpo disponata por '%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignoras blokon de speco %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu �losiloj jam traktitaj\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "      Nombro traktita entute: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "    ignoritaj novaj �losiloj: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sen uzantidentigilo: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  ne�an�itaj: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      novaj uzantidentigiloj: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novaj sub�losiloj: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "            novaj subskriboj: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "         novaj �losilrevokoj: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "sekretaj �losiloj importitaj: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "sekretaj �losiloj ne�an�itaj: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  importitaj: %lu"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "            novaj subskriboj: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "   sekretaj �losiloj legitaj: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, 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:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 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:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, 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:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, 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:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "�losilo %08lX: %d novaj subskriboj\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "�losilo %08lX: %d novaj subskriboj\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, 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:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, 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:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, 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:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, 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:1515
+#: g10/import.c:1571
 #, 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:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, 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:1554
+#: g10/import.c:1610
 #, 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:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, 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:1754
+#: g10/import.c:1786
 #, 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:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -2478,51 +2503,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:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 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:347 g10/keylist.c:412
+#: g10/keyedit.c:346 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:349 g10/keylist.c:414
+#: g10/keyedit.c:348 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:351 g10/keylist.c:416
+#: g10/keyedit.c:350 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:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 uzantidentigilo sen valida mem-subskribo estis trovita\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, 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:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2535,64 +2560,64 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fidas iomete\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi plene fidas\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 #, 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:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2603,7 +2628,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -2612,7 +2637,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2623,12 +2648,12 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 #, 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:751
+#: g10/keyedit.c:750
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2639,7 +2664,7 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -2648,53 +2673,53 @@ msgstr ""
 "\n"
 "�u vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, 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:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jam estis %ssubskribita per �losilo %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 #, 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:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "�i tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 #, 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:883
+#: g10/keyedit.c:882
 #, 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:885
+#: g10/keyedit.c:884
 #, 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:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2703,31 +2728,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:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Mi tute ne kontrolis.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Mi malzorge kontrolis.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Mi tre zorge kontrolis.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2736,98 +2761,98 @@ msgstr ""
 "�u vi estas tute certa, ke vi volas subskribi �i tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, 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:972
+#: g10/keyedit.c:971
 #, 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:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel neeksportebla.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La subskribo estos markita kiel nerevokebla.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Mi tute ne kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Mi malzorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Mi tre zorge kontrolis �i tiun �losilon.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, 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:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne povas redakti �i tiun �losilon: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2835,11 +2860,11 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2847,176 +2872,181 @@ msgstr ""
 "Vi ne deziras pasfrazon - tio ver�ajne estas *malbona* ideo!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, 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:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "neuzebla sekreta �losilo"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3052,113 +3082,113 @@ msgstr "�losilo estas revokita.\n"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
@@ -3274,16 +3304,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
@@ -3303,7 +3331,7 @@ 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:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 #, 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) "
@@ -3347,11 +3375,11 @@ msgstr "Nenio estis forvi�ita.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3361,181 +3389,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:3348
+#: g10/keyedit.c:3322
 #, 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:3368
+#: g10/keyedit.c:3342
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, 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:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, 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:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 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:3573
+#: g10/keyedit.c:3547
 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:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, 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:3960
+#: g10/keyedit.c:3934
 #, 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:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, 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:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 #, 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:4241
+#: g10/keyedit.c:4215
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3885,7 +3913,7 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4611,34 +4639,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:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, 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:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problemo kun agento - mal�altas uzadon de agento\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4649,28 +4677,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4680,17 +4708,17 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -5678,7 +5706,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "kontrolo de fido-datenaro ne estas bezonata\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sekva kontrolo de fido-datenaro je %s\n"
@@ -5706,33 +5734,33 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "kontrolas la fido-datenaron\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "publika �losilo de absolute fidata �losilo %08lX ne trovita\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, 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:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "fido-datenaro %lu, speco %d: skribo malsukcesis: %s\n"
@@ -6048,6 +6076,10 @@ 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 "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
diff --git a/po/es.po b/po/es.po
index 9f6cd867b..7653f36dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -34,7 +34,7 @@ msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -76,7 +76,7 @@ msgstr "no se puede leer `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -249,7 +249,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponente p�blico demasiado grande (m�s de 32 bits)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -390,7 +390,7 @@ msgid "can't do this in batch mode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Su elecci�n: "
@@ -453,7 +453,7 @@ msgstr "URL de donde recuperar la clave p�blica: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
@@ -559,7 +559,7 @@ msgstr "   (2) Clave de cifrado\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
@@ -580,7 +580,7 @@ msgstr "las partes secretas de la clave no est�n disponibles\n"
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sale de este men�"
 
@@ -588,7 +588,7 @@ msgstr "sale de este men�"
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
@@ -660,11 +660,11 @@ msgstr "No se permiten �rdenes de administrador\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -673,35 +673,35 @@ msgstr ""
 "Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Pulse Intro cuando est� listo"
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "Introduzca nuevo PIN de administrador: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "Introduzca el nuevo PIN: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Introduzca PIN de administrador: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "Introduzca PIN: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "Repita este PIN: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -711,13 +711,13 @@ msgstr "no se puede abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -910,26 +910,26 @@ msgstr "AVISO: no se puede borrar fichero temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: no se puede borrar el fichero temporal `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "no se permite exportar claves secretas\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "clave %s: no protegida - omitida\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVISO: la clave secreta %s no tiene suma de comprobaci�n simple SK\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCI�N: no se ha exportado nada\n"
 
@@ -1151,15 +1151,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1169,7 +1169,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1177,71 +1177,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1249,18 +1249,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1268,365 +1268,365 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1634,11 +1634,11 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1646,28 +1646,28 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -1675,26 +1675,26 @@ msgstr "la URL del servidor de claves preferido no es v�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
@@ -2064,398 +2064,423 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "No hay ayuda disponible para `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "omitiendo bloque de tipo %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu claves procesadas hasta ahora\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Cantidad total procesada: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      omitidas nuevas claves: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sin identificador: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importadas: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             sin cambios: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones de claves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          no importadas: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "firmas creadas hasta ahora: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "     claves secretas le�das: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVISO: la clave %s contiene preferencias para no disponible\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "algoritmos en estos IDs de usuarios:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "clave %s: \"%s\" %d firmas nuevas\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "clave %s: \"%s\" %d firmas nuevas\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "clave %s: no hay subclave que unir a la clave\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "clave %s: firma caducada con la clave %s - omitida\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
@@ -2479,51 +2504,51 @@ msgstr "%s: problema lectura del bloque de clave: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Detectado 1 identificador de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Detectados %d identificadores de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2535,17 +2560,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o un poco\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2555,46 +2580,46 @@ msgstr ""
 "Un nivel mayor que 1 permite que la clave que est� firmando pueda\n"
 "hacer firmas de confianza en su nombre.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Introduzca un dominio para restringir esta firma, o intro para nada.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" no tiene autofirma."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2603,11 +2628,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quiere convertirla en una autofirma OpenPGP? (s/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2616,11 +2641,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quiere producir una nueva firma que reemplace a la expirada? (s/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2629,43 +2654,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quiere convertirla en una clave totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada localmente por la clave %s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ya estaba firmada por la clave %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quiere firmarlo a�n as�? (s/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que firmar con la clave %s\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "�Esta clave ha caducado!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta clave expirar� el %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quiere que su firma caduque al mismo tiempo? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2673,11 +2698,11 @@ msgstr ""
 "No puede hacer una firma OpenPGP de una clave PGP 2.x estando en modo --"
 "pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Esto inutilizar�a la clave en PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2687,31 +2712,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) No lo he comprobado en absoluto.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) He hecho una comprobaci�n informal.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Lo he comprobado meticulosamente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�Su elecci�n? (escriba '?' si desea m�s informaci�n): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2720,76 +2745,76 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Esto ser� una autofirma.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ATENCION: la firma no se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVISO: la firma no se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La firma se marcar� como no exportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La firma se marcar� como no revocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "No he comprobado esta clave en absoluto.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "La clave tiene s�lo un apuntador u objetos de clave en la propia tarjeta\n"
 "- no hay frase contrase�a que cambiar.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Las partes secretas de la clave primaria no est�n disponibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2797,11 +2822,11 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2809,155 +2834,160 @@ msgstr ""
 "No ha especificado frase contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "establecer URL del servidor de claves preferido por los IDs seleccionados"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "clave secreta inutilizable"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2994,103 +3024,103 @@ msgstr "La clave est� revocada."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
@@ -3204,15 +3234,13 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "caducada"
 
@@ -3233,7 +3261,7 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
@@ -3276,12 +3304,12 @@ msgstr "No se borr� nada\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "Armadura no v�lida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3290,171 +3318,171 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
@@ -3797,7 +3825,7 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4508,34 +4536,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "el programa no permite usar el protocolo agente gpg versi�n %d\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con el agente - inhabilitando el uso del agente\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4546,27 +4574,27 @@ msgstr ""
 "del usuario: \"%.*s\"\n"
 "%u bits, clave %s, ID %s, creada el %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Repita frase contrase�a\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposible pedir frase contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Introduzca frase contrase�a: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4575,17 +4603,17 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repita frase contrase�a: "
 
@@ -5566,7 +5594,7 @@ msgstr "absoluta"
 msgid "no need for a trustdb check\n"
 msgstr "no es necesaria una comprobaci�n de la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "siguiente comprobaci�n de base de datos de confianza el: %s\n"
@@ -5598,28 +5626,28 @@ msgstr "por favor haga un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "comprobando base de datos de confianza\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d claves procesadas (%d validaciones superadas)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "no se encuentran claves absolutamente fiables\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "clave p�blica de la clave absolutamente fiable %s no encontrada\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d dudosa(s) necesarias, %d completa(s) necesarias,\n"
 "modelo de confianza %s\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5627,7 +5655,7 @@ msgstr ""
 "nivel: %d  validez: %3d  firmada: %3d  confianza: %d-, %dq, %dn, %dm, %df, %"
 "du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5965,6 +5993,9 @@ msgstr "operaci�n imposible sin memoria segura inicializada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(es posible que haya usado el programa incorrecto para esta tarea)\n"
 
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "clave %s: firma caducada con la clave %s - omitida\n"
+
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "no se puede ejecutar el programa `%s': %s\n"
diff --git a/po/et.po b/po/et.po
index b2d45635f..2c4e41507 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr "entroopia kogumise moodul puudub\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -66,7 +66,7 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -239,7 +239,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -383,7 +383,7 @@ msgid "can't do this in batch mode\n"
 msgstr "seda ei saa teha pakettmoodis\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Teie valik? "
@@ -451,7 +451,7 @@ msgstr "vastavat avalikku v�tit pole: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -562,7 +562,7 @@ msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
@@ -587,7 +587,7 @@ msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
@@ -596,7 +596,7 @@ msgstr "v�lju sellest men��st"
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
@@ -676,48 +676,48 @@ msgstr "kirjutan salajase v�tme faili `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Korrake parooli: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -727,13 +727,13 @@ msgstr "`%s' ei �nnestu avada\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -926,27 +926,27 @@ msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "HOIATUS: ei �nnestu eemaldada ajutist kataloogi `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "v�ti %08lX: ei ole kaitstud - j�tsin vahele\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "v�ti %08lX: PGP 2.x stiilis v�ti - j�tsin vahele\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "HOIATUS: salajases v�tmes %08lX puudub lihtne SK kontrollsumma\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
@@ -1161,15 +1161,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1179,7 +1179,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1187,468 +1187,468 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1656,28 +1656,28 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1686,29 +1686,29 @@ msgstr "antud allkirja poliisi URL on vigane\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -2059,399 +2059,424 @@ msgstr "Abiinfo puudub"
 msgid "No help available for `%s'"
 msgstr "`%s' kohta abiinfo puudub"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "j�tan bloki t��biga %d vahele\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu v�tit on seni t��deldud\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "T��deldud kokku: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr " vahele j�etud uusi v�tmeid: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    puudub kasutaja ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "            imporditud: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              muutmata: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       uusi kasutajaid: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      uusi alamv�tmeid: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         uusi allkirju: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      uusi t�histamisi: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " salajasi v�tmeid imporditud: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muutmata salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       pole imporditud: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "         uusi allkirju: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr " loetud salajasi v�tmeid: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -2476,51 +2501,51 @@ msgstr "viga `%s' loomisel: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[t�histamine]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allkiri j�i testimata, kuna v�ti puudub\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allkirja j�i testimata, kuna v�tmed puuduvad\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "tuvastasin �he kehtiva iseenda allkirjata kasutaja ID\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "tuvastasin %d kehtiva iseenda allkirjata kasutaja IDd\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2533,63 +2558,63 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest n�puj�lgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Usaldan v�hesel m��ral\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Usaldan t�iesti\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2598,11 +2623,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Kas te soovite seda edutada OpenPGP iseenda allkirjaks? (j/E) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2611,11 +2636,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Kas soovite luua uut allkirja et asendada vana aegunud? (j/E) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2624,54 +2649,54 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Kas te soovite seda edutada t�ielikuks eksporditavaks allkirjaks? (j/E) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on juba lokaalselt allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on juba allkirjastatud v�tmega %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/E) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "V�tmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "See v�ti on aegunud!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "See v�ti aegub %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Soovite, et teie allkiri aeguks samal ajal? (J/e) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2 moodis ei saa PGP 2.x v�tmele OpenPGP allkirja anda.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "See muudab v�tme PGP 2.x programmidega mitte-kasutatavaks.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2681,32 +2706,32 @@ msgstr ""
 "kuulub ka tegelikult �lal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Ma ei ole �ldse kontrollinud.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Ma olen teinud pealiskaudset kontrolli.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ma olen kontrollinud v�ga hoolikalt.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2715,100 +2740,100 @@ msgstr ""
 "Olete t�esti kindel, et soovite seda v�tit oma\n"
 "v�tmega allkirjastada: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "HOIATUS: allkirja ei m�rgita kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse mitte-eksporditavaks.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Allkiri m�rgitakse kehtetuks mitte-tunnistatavaks.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Ma ei ole seda v�tit �ldse kontrollinud.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ma olen seda v�tit kontrollinud ainult pealiskaudselt.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ma olen kontrollinud seda v�tit v�ga hoolikalt.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Seda v�tit ei �nnestu toimetada: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2816,11 +2841,11 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2828,175 +2853,180 @@ msgstr ""
 "Te ei soovi parooli - see on t�en�oliselt *halb* idee!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "mittekasutatav salajane v�ti"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3031,113 +3061,113 @@ msgstr "V�ti on t�histatud."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
@@ -3255,16 +3285,14 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3286,7 +3314,7 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
@@ -3329,12 +3357,12 @@ msgstr "Midagi ei kustutatud.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3343,177 +3371,177 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@ -3862,7 +3890,7 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4575,34 +4603,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agendi protokolli versioon %d ei ole toetatud\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probleem agendiga - blokeerin agendi kasutamise\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4613,28 +4641,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Korrake parooli\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4644,17 +4672,17 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Korrake parooli: "
 
@@ -5643,7 +5671,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb kontrolliks puudub vajadus\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "trustdb j�rgmine kontroll %s\n"
@@ -5671,32 +5699,32 @@ msgstr "palun tehke --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrollin trustdb faili\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d v�tit t��deldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "absoluutselt usaldatavaid v�tmeid pole\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "puudub absoluutselt usaldatava v�tme %08lX avalik v�ti\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "usalduse kirje %lu, t��p %d: kirjutamine eba�nnestus: %s\n"
@@ -6010,6 +6038,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index 195c29f19..aa0531197 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -46,7 +46,7 @@ msgstr "entropian keräysmoduulia ei havaittu\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -83,7 +83,7 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -257,7 +257,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -403,7 +403,7 @@ msgid "can't do this in batch mode\n"
 msgstr "tätä ei voi tehdä eräajossa\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Valintasi? "
@@ -471,7 +471,7 @@ msgstr "ei vastaavaa julkista avainta: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -582,7 +582,7 @@ msgstr "   (%d) RSA (vain salaus)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
@@ -607,7 +607,7 @@ msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
@@ -616,7 +616,7 @@ msgstr "ulos tästä valikosta"
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
@@ -696,48 +696,48 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Toista salasana: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -747,13 +747,13 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -944,29 +944,29 @@ msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROITUS: väliaikaishakemistoa \"%s\" ei voi poistaa: %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "avain %08lX: ei suojattu - ohitetaan\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "VAROITUS: salaisella avaimella %08lX ei ole yksinkertaista SK-"
 "tarkistussummaa\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
@@ -1181,16 +1181,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1200,7 +1200,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1208,469 +1208,469 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1678,28 +1678,28 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1708,29 +1708,29 @@ msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -2091,402 +2091,427 @@ msgstr "Ei ohjeita saatavilla"
 msgid "No help available for `%s'"
 msgstr "Ei ohjetta aiheesta \"%s\""
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ohitetaan tyypin %d lohko\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Kaikkiaan käsitelty: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ohitetaan uudet avaimet: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          ilman käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              tuotu: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             muuttamatonta: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          uusia käyttäjätunnuksia: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           uusia aliavaimia: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   uusia avainten mitätöintejä: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  tuotuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " muuttamattomia salaisia avaimia: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          ei tuotu: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        uusia allekirjoituksia: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      luettuja salaisia avaimia: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -2511,52 +2536,52 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta puuttuvien avainten vuoksi\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "havaittiin 1 käyttäjätunnus ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "havaittiin %d käyttäjätunnusta ilman voimassaolevaa oma-allekirjoitusta\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2569,63 +2594,63 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Luotan osittain\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Luotan täysin\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Käyttäjätunnuksella \"%s\" ei ole oma-allekirjoitusta."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2634,13 +2659,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi OpenPGP-allekirjoitukseksi? "
 "(k/E) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2649,11 +2674,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Haluatko tehdä uuden allekirjoituksen korvaamaan vanhentuneen? (k/E) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2662,55 +2687,55 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Haluatko vahventaa sen täysin vientikelpoiseksi allekirjoitukseksi? (k/E) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu paikallisesti avaimella %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" on jo allekirjoitettu avaimella %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Haluatko allekirjoittaa uudelleen joka tapauksessa? (k/E) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Haluatko allekirjoituksesi vanhenevan samaan aikaan? (K/e) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Et voi luoda OpenPGP-allekirjoitusta PGP 2.x -avaimella --pgp2-tilassa.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Tämä tekisi avaimesta käyttökelvottoman PGP 2.x:lle.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2719,32 +2744,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) En ole tarkistanut lainkaan.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Olen suorittanut arkisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Olen suorittanut huolellisen tarkistuksen.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2753,100 +2778,100 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROITUS: Tätä allekirjoitusta ei määritellä mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään vientikelvottomaksi.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Tämä allekirjoitus määritellään mitätöimättömäksi.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "En ole tarkistanut tätä avainta lainkaan.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen erittäin huolellisesti.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ei voi muokata avainta: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2854,11 +2879,11 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2866,175 +2891,180 @@ msgstr ""
 "Et halua salasanaa - tämä on todennäköisesti *huono* ajatus!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "salaista avainta ei voi käyttää"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3069,113 +3099,113 @@ msgstr "Avain on mitätöity."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
@@ -3293,16 +3323,14 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3324,7 +3352,7 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
@@ -3367,12 +3395,12 @@ msgstr "Mitään ei poistettu.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3382,179 +3410,179 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3907,7 +3935,7 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4632,34 +4660,34 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent-protokollaversio %d ei ole tuettu\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "agentin käytössä on ongelmia - agenttia ei käytetä\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4670,28 +4698,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Toista salasana\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4700,17 +4728,17 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Toista salasana: "
 
@@ -5723,7 +5751,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "trustdb:n tarkistusta ei tarvita\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "seuraava trustdb tarkistus %s\n"
@@ -5751,32 +5779,32 @@ msgstr "tee --check-trustdb, kiitos\n"
 msgid "checking the trustdb\n"
 msgstr "tarkistetaan trustdb:tä\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "ehdottomasti luotettavia avaimia ei löytynyt\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "ehdottomasti luotettu julkinen avain %08lX ei löytynyt\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "luottamustietue %lu, tyyppi %d: kirjoittaminen epäonnistui: %s\n"
@@ -6090,6 +6118,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
diff --git a/po/fr.po b/po/fr.po
index d5d90817a..a7bfb526a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.93-cvs\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-11-08 01:13+0100\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -35,7 +35,7 @@ msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -73,7 +73,7 @@ msgstr "impossible de lire `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -254,7 +254,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public est trop �lev� (plus de 32 bits)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -396,7 +396,7 @@ msgid "can't do this in batch mode\n"
 msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Votre choix ? "
@@ -459,7 +459,7 @@ msgstr "URL pour r�cup�rer la cl� publique: %s"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -567,7 +567,7 @@ msgstr "   (2) Cl� de chiffrement\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
@@ -588,7 +588,7 @@ msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
@@ -596,7 +596,7 @@ msgstr "quitter ce menu"
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afficher cette aide"
 
@@ -670,11 +670,11 @@ msgstr "Les commandes d'administration ne sont pas permises\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -684,39 +684,39 @@ msgstr ""
 "s�rie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "R�p�tez le mot de passe: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -726,13 +726,13 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -934,28 +934,28 @@ msgstr ""
 "AVERTISSEMENT: impossible d'effacer le r�pertoire temporaire `%s':\n"
 "%s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "il est interdit d'exporter les cl� secr�tes\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cl� %s: non prot�g�e - ignor�e\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cl� %s: cl� de style PGP 2.x - ignor�e\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVERTISSEMENT: la cl� secr�te %s n'a pas de somme de contr�le SK\n"
 "simple\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
@@ -1169,17 +1169,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1189,7 +1189,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1197,85 +1197,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1283,21 +1283,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1305,393 +1305,393 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�criture d'un bout de cl� secr�te vers `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1699,28 +1699,28 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -1728,30 +1728,30 @@ msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la cl� secondaire %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
@@ -2118,407 +2118,432 @@ msgstr "Pas d'aide disponible"
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "un bloc de type %d a �t� ignor�\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       nouvelles cl�s ignor�es: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                  non import�e: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "          nouvelles signatures: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "            cl�s secr�tes lues: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "algorithmes indisponibles sur ces noms d'utilisateurs:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "cl� %s: � %s � %d nouvelles signatures\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "cl� %s: � %s � %d nouvelles signatures\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
@@ -2543,51 +2568,51 @@ msgstr "erreur pendant la cr�ation de `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[r�vocation]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2599,17 +2624,17 @@ msgstr ""
 "v�rifier son passeport, v�rifier les empreintes de plusieurs sources\n"
 "diff�rentes, etc.)\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = je crois marginalement\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = je fais enti�rement confiance\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2619,48 +2644,48 @@ msgstr ""
 "Une profondeur sup�rieure � 1 permet � la cl� que vous signez de faire\n"
 "des signatures de confiance de votre part.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Entrez un domaine pour restreindre cette signature, ou bien appuyez\n"
 "sur la touche entr�e pour aucun domaine.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Le nom d'utilisateur \"%s\" est expir�."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Le nom d'utilisateur \"%s\" ne comporte pas d'auto-signature."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2669,11 +2694,11 @@ msgstr ""
 "L'auto-signature de \"%s\"\n"
 "est de style PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Voulez vous la changer en une auto-signature OpenPGP ? (o/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2682,13 +2707,13 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "a expir�.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Voulez-vous cr�er une nouvelle signature pour remplacer celle qui a\n"
 "expir� ? (o/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2697,43 +2722,43 @@ msgstr ""
 "Votre signature actuelle de \"%s\"\n"
 "est locale.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Voulez vous la rendre compl�tement exportable ? (o/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� localement par la cl� %s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "� %s � a d�j� �t� sign� par la cl� %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voulez-vous vraiment le signer encore une fois ? (o/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Rien � signer avec la cl� %s\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Cette cl� a expir� !"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Cette cl� va expirer le %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Voulez-vous que votre signature expire en m�me temps ? (O/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2741,11 +2766,11 @@ msgstr ""
 "il n'est pas possible de g�n�rer une signature OpenPGP d'une cl� de style\n"
 "PGP 2.x en mode --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Cela rendra la cl� inutilisable par PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2755,32 +2780,32 @@ msgstr ""
 "appartient r�ellement � la personne sus-nomm�e ? Si vous ne savez\n"
 "quoi r�pondre, entrez \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Je ne r�pondrai pas.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Je n'ai pas v�rifi� du tout.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) J'ai un peu v�rifi�.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) J'ai v�rifi� tr�s soigneusement.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Votre s�lection ? (entrer '?' pour plus d'informations): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2789,89 +2814,89 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec votre cl� � %s � (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "AVERTISSEMENT: la signature ne sera pas marqu�e comme\n"
 "non-exportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "AVERTISSEMENT: La signature ne sera pas marqu�e comme\n"
 "non-r�vocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "La signature sera marqu�e comme non-exportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "La signature sera marqu�e comme non-r�vocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Je n'ai pas du tout v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "J'ai un peu v�rifi� cette cl�.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parties secr�tes de la cl� principale ne sont pas disponibles.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossible d'�diter cette cl�: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "le mot de passe n'a pas �t� correctement r�p�t� ; recommencez."
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2880,179 +2905,184 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "r�voquer les signatures"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur comme principal"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "indiquer l'URL du serveur de cl�s pr�f�r�"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "r�voquer un nom d'utilisateur"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer une cl� secondaire"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "activer une cl�"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "d�sactiver une cl�"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montrer la photo d'identit�"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "cl� secr�te inutilisable"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3086,107 +3116,107 @@ msgstr "La cl� est r�voqu�e."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de signature inconnue"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
@@ -3302,15 +3332,13 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "expir�e"
 
@@ -3333,7 +3361,7 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
@@ -3377,12 +3405,12 @@ msgstr "Rien n'a �t� supprim�.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "armure invalide"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3392,182 +3420,182 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3916,7 +3944,7 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4645,34 +4673,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'environnement GPG_AGENT_INFO est mal d�finie\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "le protocole gpg-agent version %d n'est pas support�\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4684,27 +4712,27 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "R�p�tez le mot de passe\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Entrez le mot de passe\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossible de demander la phrase de passe en mode automatique\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4713,17 +4741,17 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
@@ -5746,7 +5774,7 @@ msgstr "ultime"
 msgid "no need for a trustdb check\n"
 msgstr "v�rification de la base de confiance inutile\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "la prochaine v�rification de la base de confiance aura lieu le %s\n"
@@ -5778,28 +5806,28 @@ msgstr "faites un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "v�rifier la base de confiance\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d cl�s trait�es (%d comptes de validit� r�initialis�s)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "aucune cl� de confiance ultime n'a �t� trouv�e\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "la cl� publique de la cl� de confiance ultime %s est introuvable\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginale(s) n�cessaires, %d compl�te(s) n�cessaires, mod�le\n"
 "de confiance %s\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5807,7 +5835,7 @@ msgstr ""
 "profondeur: %d  valide: %3d  sign�: %3d\n"
 "confiance: %d-. %dg. %dn. %dm. %df. %du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -6124,6 +6152,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "impossible d'ex�cuter le programme `%s': %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index ada76c348..ae482c27a 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -66,7 +66,7 @@ msgstr "non se pode ler de `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -242,7 +242,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -387,7 +387,7 @@ msgid "can't do this in batch mode\n"
 msgstr "non se pode facer iso no modo por lotes\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
@@ -455,7 +455,7 @@ msgstr "non hai unha chave p�blica correspondente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -566,7 +566,7 @@ msgstr "   (%d) RSA (s� cifrar)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
@@ -591,7 +591,7 @@ msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
@@ -600,7 +600,7 @@ msgstr "sa�r deste men�"
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "amosar esta axuda"
 
@@ -680,51 +680,51 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita o contrasinal: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -734,13 +734,13 @@ msgstr "non se puido abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -936,28 +936,28 @@ msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: non se puido elimina-lo directorio temporal `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: non est� protexida - omitida\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "AVISO: a chave secreta %08lX non ten unha suma de comprobaci�n SK simple\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
@@ -1172,17 +1172,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1192,7 +1192,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1200,472 +1200,472 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1673,28 +1673,28 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1703,29 +1703,29 @@ msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
@@ -2077,410 +2077,435 @@ msgstr "Non hai axuda dispo�ible"
 msgid "No help available for `%s'"
 msgstr "Non hai axuda dispo�ible para `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pasando por alto un bloque de tipo %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves procesadas hasta polo momento\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total procesado: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "novas chaves omitidas: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "   sin IDs de usuario: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importadas: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          sin cambios: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr " novos IDs de usuario: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "     novas sub-chaves: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "         novas sinaturas: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " novas revocaci�ns de chaves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chaves secretas importadas: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chaves secretas sin cambios: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "       non importadas: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "         novas sinaturas: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "chaves secretas lidas: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -2505,51 +2530,51 @@ msgstr "erro ao crear `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocaci�n]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d sinaturas non verificadas debido a chaves que faltan\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "detectado 1 ID de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "detectados %d IDs de usuario sin auto-sinatura v�lida\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2561,63 +2586,63 @@ msgstr ""
 "correctamente as chaves de outros usuarios (mirando nos pasaportes,\n"
 "comprobando pegadas dactilares de varias fontes...).\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Conf�o marxinalmente\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Conf�o totalmente\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" est� caducado."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "O ID de usuario \"%s\" non est� asinado por el mesmo."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2626,11 +2651,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "� unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "�Quere promovela a unha auto-sinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2639,11 +2664,11 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "�Quere emitir unha nova sinatura que substit�a � caducada? (s/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2652,54 +2677,54 @@ msgstr ""
 "A s�a sinatura actual en \"%s\"\n"
 "� unha sinatura local.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "�Quere promovela a sinatura totalmente exportable? (s/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado localmente coa chave %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" xa estaba asinado coa chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�Quere asinalo outra vez de t�dolos xeitos? (s/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "�Esta chave caducou!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave ha caducar o %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�Quere que a s�a sinatura caduque ao mesmo tempo? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Non pode facer unha sinatura OpenPGP nunha chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto poder�a face-la chave non utilizable en PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2708,32 +2733,32 @@ msgstr ""
 "�Con canto tino comprobou que a chave que vai asinar realmente pertence �\n"
 "persoa de enriba? Se non sabe que respostar, introduza \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non o comprobei en absoluto.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Fixen algunhas comprobaci�ns.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Fixen comprobaci�ns moi exhaustivas.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�A s�a elecci�n? (introduza '?' para ter m�is informaci�n): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2742,100 +2767,100 @@ msgstr ""
 "�Esta seguro de que quere asinar esta chave\n"
 "coa s�a chave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a sinatura non se ha marcar coma non exportable.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: A sinatura non se ha marcar coma non revocable.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non exportable.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A sinatura hase marcar coma non revocable.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non se comprobou esta chave en absoluto.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave de xeito informal.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Comprobouse esta chave con moito tino.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Non se pode editar esta chave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2843,11 +2868,11 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2855,179 +2880,184 @@ msgstr ""
 "Non desexa un contrainal - �o que � unha *mala* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "chave secreta non utilizable"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3062,115 +3092,115 @@ msgstr "A chave est� revocada."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
@@ -3288,16 +3318,14 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3319,7 +3347,7 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
@@ -3364,12 +3392,12 @@ msgstr "Non se borrou nada.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3379,182 +3407,182 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3906,7 +3934,7 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4627,34 +4655,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a versi�n %d do protocolo de gpg-agent non est� soportada\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema co axente - desactivando o emprego do axente\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4665,28 +4693,28 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Repita o contrasinal\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4696,17 +4724,17 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repita o contrasinal: "
 
@@ -5718,7 +5746,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non se precisa comproba-la base de datos de confianza\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "hase comproba-la base de datos de confianza o %s\n"
@@ -5746,32 +5774,32 @@ msgstr "por favor, execute con --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "comprobando a base de datos de confianza\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "proces�ronse %d chaves (marc�ronse %d contas de validez)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "non se atoparon chaves de confianza absoluta\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "non se atopou a chave p�blica da clave de confianza absoluta %08lX\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "rexistro de confianza %lu, tipo %d: fallou a escritura: %s\n"
@@ -6086,6 +6114,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "non se puido executar %s \"%s\": %s\n"
 
diff --git a/po/hu.po b/po/hu.po
index 5a8f54d9a..f30936f94 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,7 +67,7 @@ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -241,7 +241,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -385,7 +385,7 @@ msgid "can't do this in batch mode\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
@@ -453,7 +453,7 @@ msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -564,7 +564,7 @@ msgstr "   (%d) RSA (csak titkos�t�s)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
@@ -589,7 +589,7 @@ msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
@@ -598,7 +598,7 @@ msgstr "kil�p�s ebb�l a men�b�l"
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
@@ -678,48 +678,48 @@ msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -729,13 +729,13 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -926,27 +926,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "FIGYELEM: nem tudom t�r�lni a \"%s\" �tmeneti k�nyvt�rat: %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "%08lX kulcs: nem v�dett - kihagytam.\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x st�lus� kulcs - kihagytam.\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer� SK ellen�rz��sszege.\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
@@ -1161,15 +1161,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1179,7 +1179,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1187,469 +1187,469 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1657,28 +1657,28 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -1687,30 +1687,30 @@ msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
@@ -2069,402 +2069,427 @@ msgstr "Nem �ll rendelkez�sre seg�ts�g."
 msgid "No help available for `%s'"
 msgstr "Nem �ll rendelkez�sre seg�ts�g \"%s\" t�m�hoz."
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d t�pus� blokkot kihagyom.\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Eddig %lu kulcsot dolgoztam fel.\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "     �sszesen feldolgoztam: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "       �j kulcsok kihagyva: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    felh. azonos�t� n�lk�l: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                import�lva: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "               v�ltozatlan: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "       �j felh. azonos�t�k: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              �j alkulcsok: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              �j al��r�sok: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     �j kulcsvisszavon�sok: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  import�lt titkos kulcsok: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "v�ltozatlan titkos kulcsok: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             nem import�lt: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "              �j al��r�sok: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "   olvasott titkos kulcsok: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -2489,51 +2514,51 @@ msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[visszavon�s]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d al��r�st nem ellen�riztem hi�nyz� kulcs miatt.\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d felhaszn�l�azonos�t�t tal�ltam �rv�nyes �nal��r�s n�lk�l.\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2546,63 +2571,63 @@ msgstr ""
 "k�l�nb�z� forr�sb�l sz�rmaz� digit�lis ujjlenyomatokkal...)!\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = r�szlegesen megb�zom benne\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = teljesen megb�zom benne\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhaszn�l�i azonos�t� lej�rt."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "\"%s\" felhaszn�l�azonos�t�n nincs �nal��r�s."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2611,11 +2636,11 @@ msgstr ""
 "\"%s\" �nal��r�sa\n"
 "PGP 2.x st�lus�.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Szeretn� �talak�tani OpenPGP �nal��r�ss�? (i/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2624,11 +2649,11 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson lej�rt.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Szeretne kiadni egy �j al��r�st, amellyel lecser�li a lej�rtat? (i/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2637,54 +2662,54 @@ msgstr ""
 "Az �n jelenlegi al��r�sa a(z) \"%s\"\n"
 "kulcson helyi al��r�s.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Szeretn� �talak�tani teljes, export�lhat� al��r�ss�? (i/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva helyileg a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" m�r al� lett �rva a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "M�g egyszer al� akarja �rni? (i/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nincs mit al��rni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Ez a kulcs lej�rt!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Ez a kulcs lej�r: %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Szeretn�, ha az al��r�sa ugyanekkor j�rna le? (I/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Lehet, hogy nem rakhat OpenPGP al��r�st egy PGP 2.x kulcsra --pgp2 m�dban.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Ez haszn�lhatatlann� tenn� a kulcsot PGP 2.x-ben.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2693,32 +2718,32 @@ msgstr ""
 "Mennyire gondosan ellen�rizte, hogy a kulcs, melyet al��rni k�sz�l, val�ban\n"
 "a fent nevezett szem�lyhez tartozik? Ha nem tudja a v�laszt, �rjon \"0\"-t!\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem v�laszolok.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Egy�ltal�n nem ellen�riztem.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) A szok�sos ellen�rz�seket v�geztem.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Nagyon alaposan ellen�riztem.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Mi a v�lasza? (Adjon meg \"?\"-et magyar�zathoz!): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2727,100 +2752,100 @@ msgstr ""
 "Teljesen biztos abban, hogy al� akarja �rni ezt a kulcsot\n"
 "az �n kulcs�val: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem export�lhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "FIGYELEM: Az al��r�s nem lesz \"nem visszavonhat�k�nt\" megjel�lve.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem export�lhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Az al��r�st \"nem visszavonhat�nak\" jel�lj�k.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Egy�ltal�n nem ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "A szok�sos m�don ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Nagyon gondosan ellen�riztem ezt a kulcsot.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nem tudom szerkeszteni ezt a kulcsot: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2828,11 +2853,11 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2840,175 +2865,180 @@ msgstr ""
 "�n nem akar jelsz�t. Ez val�sz�n�leg *rossz* �tlet!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "haszn�lhatatlan titkos kulcs"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3043,113 +3073,113 @@ msgstr "A kulcsot visszavont�k."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
@@ -3267,16 +3297,14 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3299,7 +3327,7 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
@@ -3342,12 +3370,12 @@ msgstr "Nem t�r�ltem semmit.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3357,179 +3385,179 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
@@ -3880,7 +3908,7 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4603,36 +4631,36 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "Nem megfelel� form�j� GPG_AGENT_INFO k�rnyezeti v�ltoz�!\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "%d gpg-agent protokollverzi� nem t�mogatott!\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "Probl�ma van az �gyn�kkel. Letiltom a haszn�lat�t.\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4644,28 +4672,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Ism�telje meg a jelsz�t!\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "�rja be a jelsz�t: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4676,17 +4704,17 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Ism�telje meg a jelsz�t: "
 
@@ -5686,7 +5714,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "Nincs sz�ks�g a bizalmi adatb�zis ellen�rz�s�re.\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "A bizalmi adatb�zis k�vetkez� ellen�rz�se: %s.\n"
@@ -5714,32 +5742,32 @@ msgstr "K�rem, hajtson v�gre egy --check-trustdb parancsot!\n"
 msgid "checking the trustdb\n"
 msgstr "Ellen�rz�m a bizalmi adatb�zist.\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kulcsot feldolgoztam (%d �rv�nyess�gsz�ml�l�t t�r�ltem)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "Nem tal�ltam alapvet�en megb�zhat� kulcsot.\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Nem tal�lom az alapvet�en megb�zhat� %08lX kulcs nyilv�nos kulcs�t!\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "%lu bizalmi rekord, %d t�pus: �r�s sikertelen: %s.\n"
@@ -6053,6 +6081,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
diff --git a/po/id.po b/po/id.po
index 1b5c82489..1e24c009f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -32,7 +32,7 @@ msgstr "modul entropi gathering tidak terdeteksi\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -68,7 +68,7 @@ msgstr "tidak dapat membaca `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -242,7 +242,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -387,7 +387,7 @@ msgid "can't do this in batch mode\n"
 msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Pilihan anda? "
@@ -455,7 +455,7 @@ msgstr "tidak ada kunci publik yang sesuai: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -566,7 +566,7 @@ msgstr "  (%d) RSA (hanya enkripsi)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
@@ -591,7 +591,7 @@ msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
@@ -600,7 +600,7 @@ msgstr "berhenti dari menu ini"
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
@@ -680,48 +680,48 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ulangi passphrase: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -731,13 +731,13 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -929,28 +929,28 @@ msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus direktori temp `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "kunci %08lX: tidak diproteksi - dilewati\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 "PERINGATAN: kunci rahasia %08lX tidak memiliki sebuah checksum SK sederhana\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
@@ -1165,15 +1165,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1183,7 +1183,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1191,477 +1191,477 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1669,28 +1669,28 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1699,27 +1699,27 @@ msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -2084,399 +2084,424 @@ msgstr "Tidak tersedia bantuan"
 msgid "No help available for `%s'"
 msgstr "Tidak tersedia bantuan untuk `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "melewati blok tipe %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kunci telah diproses\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Jumlah yang telah diproses: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        lewati kunci baru: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         tanpa ID user: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "             diimpor: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "            tidak berubah: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         ID user baru: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "          subkey baru: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "       signature baru: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  pembatalan kunci baru: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  kunci rahasia diimpor: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " kunci rahasia tidak berubah: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            tidak diimpor: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "       signature baru: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "     kunci rahasia dibaca: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "kunci %08lX: \"%s\" %d signature baru\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "kunci %08lX: \"%s\" %d signature baru\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
@@ -2501,51 +2526,51 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "terdeteksi 1 ID user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "terdeteksi ID %d user tanpa self-signature yang valid\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2558,63 +2583,63 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Saya cukup percaya\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Saya sangat percaya\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2623,11 +2648,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Anda ingin mempromosikannya ke self-signature OpenPGP ? (y/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2636,13 +2661,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Anda ingin mengeluarkan signature baru untuk menggantikan yang telah habis "
 "berlaku? (y/N)"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2651,43 +2676,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Apakah anda ingin menjadikannya signature yang full exportable? (y/N)"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai secara lokal dengan kunci %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" Sudah ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Apakah anda ingin menandainya lagi? (y/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Anda ingin signature anda kadaluarsa pada waktu yang sama? (y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2695,11 +2720,11 @@ msgstr ""
 "Anda tidak boleh membuat signature OpenPGP pada sebuah kunci PGP 2.x saat "
 "dalam mode --pgp2\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Hal ini akan membuat kunci tidak dapat digunakan dalam PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2709,32 +2734,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Saya tidak akan menjawab.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Saya belum memeriksanya.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Saya telah melakukan pemeriksaan biasa.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Saya telah melakukan pemeriksaan hati-hati.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2743,100 +2768,100 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Peringatan: Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat diekspor.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Signature akan ditandai sebagai tidak dapat dibatalkan.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Saya belum memeriksa kunci ini sama sekali.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini dengan sangat hati-hati.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tidak dapat mengedit kunci ini: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2844,11 +2869,11 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2856,175 +2881,180 @@ msgstr ""
 "Anda tidak ingin passphrase - bukan ide yang baik!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "kunci rahasia tidak dapat dipakai"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3059,113 +3089,113 @@ msgstr "Kunci dibatalkan"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
@@ -3283,16 +3313,14 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3315,7 +3343,7 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
@@ -3358,12 +3386,12 @@ msgstr "Tidak ada yang dihapus.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3373,182 +3401,182 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
@@ -3896,7 +3924,7 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4612,34 +4640,34 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "protokol gpg-agent versi %d tidak didukung\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "masalah dengan agen - tiadakan penggunaan agen\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4650,28 +4678,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Ulangi passphrase\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4681,17 +4709,17 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -5691,7 +5719,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "tidak perlu memeriksa trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "pemeriksaan trustdb berikutnya pada %s\n"
@@ -5719,32 +5747,32 @@ msgstr "lakukanlah --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "memeriksa trustdb\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d kunci diproses (%d hitungan validitas dihapus)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "tidak ditemukan kunci yang benar-benar terpercaya\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "kunci publik yang sangat terpercaya %08lX tidak ditemukan\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, tipe %d: gagal menulis: %s\n"
@@ -6059,6 +6087,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
diff --git a/po/it.po b/po/it.po
index d7cfa78ec..c7bcc9161 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,7 +67,7 @@ msgstr "impossibile leggere `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -243,7 +243,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -388,7 +388,7 @@ msgid "can't do this in batch mode\n"
 msgstr "impossibile fare questo in modo batch\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Cosa scegli? "
@@ -457,7 +457,7 @@ msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -568,7 +568,7 @@ msgstr "   (%d) RSA (cifra solo)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
@@ -593,7 +593,7 @@ msgstr "Parti della chiave segreta non sono disponibili.\n"
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
@@ -602,7 +602,7 @@ msgstr "abbandona questo men�"
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
@@ -682,48 +682,48 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -733,13 +733,13 @@ msgstr "impossibile aprire `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -941,27 +941,27 @@ msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ATTENZIONE: impossibile rimuovere la directory temporanea `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chiave %08lX: non protetta - saltata\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %08lX: chiave in stile PGP 2.x - saltata\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
@@ -1176,15 +1176,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1194,7 +1194,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1202,474 +1202,474 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1677,28 +1677,28 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1707,28 +1707,28 @@ msgstr "l'URL della politica di firma indicato non � valido\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -2094,402 +2094,427 @@ msgstr "Non � disponibile un aiuto"
 msgid "No help available for `%s'"
 msgstr "Non � disponibile un aiuto per `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  nuove chiavi saltate: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         senza user ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "             importate: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        non modificate: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nuovi user ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "       nuove subchiavi: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           nuove firme: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             importate: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "           nuove firme: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "  chiavi segrete lette: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
@@ -2514,51 +2539,51 @@ msgstr "errore creando `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "Trovato un user ID senza autofirma valida\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "Trovati %d user ID senza autofirme valide\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2571,63 +2596,63 @@ msgstr ""
 "impronte digitali da diverse fonti...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Mi fido marginalmente\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Mi fido completamente\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" � scaduto."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'user ID \"%s\" non � autofirmato."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2636,11 +2661,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "� una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Vuoi promuoverla in una autofirma di OpenPGP? (s/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2649,11 +2674,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� scaduta\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Vuoi fare una nuova firma per sostituire quella scaduta? (s/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2662,43 +2687,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "� una firma locale.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vuoi trasformarla in una firma completa esportabile? (s/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato localmente dalla chiave %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" era gi� stato firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare di nuovo? (s/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Questa chiave � scaduta!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Questa chiave scadr� il %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Vuoi che la tua firma scada nello stesso momento? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2706,11 +2731,11 @@ msgstr ""
 "In modalit� -pgp2 non � possibile fare firme OpenPGP su chiavi in stile PGP "
 "2.x.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Questo renderebbe la chiave non utilizzabile da PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2720,32 +2745,32 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Non l'ho controllata per niente.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) L'ho controllata superficialmente.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) L'ho controllata molto attentamente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Cosa scegli? (inserisci '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2754,100 +2779,100 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma non sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "ATTENZIONE: la firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come non esportabile.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "La firma sar� marcata come irrevocabile.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Non ho controllato per niente questa chiave.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave superficialmente.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Ho controllato questa chiave molto attentamente.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2855,11 +2880,11 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2867,175 +2892,180 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "chiave segreta inutilizzabile"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3070,113 +3100,113 @@ msgstr "La chiave � stata revocata."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
@@ -3295,16 +3325,14 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3327,7 +3355,7 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
@@ -3371,12 +3399,12 @@ msgstr "Non � stato cancellato nulla.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3386,185 +3414,185 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3915,7 +3943,7 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4639,34 +4667,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "la versione %d del protocollo di gpg-agent non � gestita\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema con l'agent - uso dell'agent disattivato\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4677,28 +4705,28 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Ripeti la passphrase\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4708,17 +4736,17 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -5740,7 +5768,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "non � necessario un controllo del trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "il prossimoi controllo del trustdb sar� fatto il %s\n"
@@ -5768,32 +5796,32 @@ msgstr "per favore usa --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "controllo il trustdb\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chiavi processate (%d conteggi di validit� azzerati)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "non � stata trovata alcuna chiave definitivamente affidabile\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "chiave pubblica definitivamente affidabile %08lX non trovata\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "trust record %lu, req type %d: write fallita: %s\n"
@@ -6108,6 +6136,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "impossibile eseguire %s \"%s\": %s\n"
 
diff --git a/po/ja.po b/po/ja.po
index 6b5e7dd1a..b9035c81b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -33,7 +33,7 @@ msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -69,7 +69,7 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -240,7 +240,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -381,7 +381,7 @@ msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "�����? "
@@ -444,7 +444,7 @@ msgstr "��������õ������URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -548,7 +548,7 @@ msgstr "   (2) �Ź沽��\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
@@ -569,7 +569,7 @@ msgstr "������̩��ʬ��̵���Ǥ�\n"
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
@@ -577,7 +577,7 @@ msgstr "���Υ�˥塼��λ"
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
@@ -649,11 +649,11 @@ msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -662,37 +662,37 @@ msgstr ""
 "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "PIN�������: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -702,13 +702,13 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -892,26 +892,26 @@ msgstr "�ٹ�: ����ե���������Ǥ��ޤ��� (%s) ��%s��: %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "�ٹ�: ����ǥ��쥯�ȥ꡼��%s�פ����Ǥ��ޤ���: %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "��̩���ν�Ф��϶ػߤǤ�\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "��%s: �ݸ��Ƥ��ޤ��� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "��%s: PGP 2.x�����θ��Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "�ٹ�: ��̩��%s�ˤϡ�ñ���SK�����å����ब����ޤ���\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
@@ -1130,15 +1130,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1148,7 +1148,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1156,486 +1156,486 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -1643,26 +1643,26 @@ msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
@@ -2021,394 +2021,419 @@ msgstr "�إ�פϤ���ޤ���"
 msgid "No help available for `%s'"
 msgstr "��%s�פΥإ�פϤ���ޤ���"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "��%d�Υ֥��å���ȤФ��ޤ�\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu���ޤǽ���\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "    �������ι��: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "�ȤФ�����������: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  �桼����ID�ʤ�: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "          �ɹ���: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "        �ѹ��ʤ�: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "�������桼����ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "      ����������: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "      ��������̾: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  ���������μ���: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  ��̩�����ɹ���: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  ̵�ѹ�����̩��: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        ̤�ɹ���: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "����ޤǤ˺������줿��̾: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "  ��̩�����ɽФ�: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "�����Υ桼����ID�Υ��르�ꥺ��:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "��%s:��%s�ɿ�������̾��%d��\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "��%s:��%s�ɿ�������̾��%d��\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "��%s: �����б���������������ޤ���\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -2433,51 +2458,51 @@ msgstr "��%s�פκ������顼: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[����]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "�����ʽ�̾1��\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "�����ʽ�̾%d��\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��1�ĸ���\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "ͭ���ʼ��ʽ�̾�Τʤ��桼����ID��%d�ĸ���\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2488,17 +2513,17 @@ msgstr ""
 "��\n"
 "(�ѥ��ݡ��Ȥ򸫤��Ƥ��ä��ꡢ¾������������򸡺������ꡢ�ʤɤʤ�)\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = �������ٿ��Ѥ���\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = �����˿��Ѥ���\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2507,46 +2532,46 @@ msgstr ""
 "���ѽ�̾�ο��������Ϥ��Ƥ���������\n"
 "������1����礭���ȡ���̾���褦�Ȥ��Ƥ��븰�ǿ��ѽ�̾����ޤ���\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "��̾�����¤���ɥ᡼�󤫡�����Τʤ�����enter�����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "�桼����ID��%s�ɤϡ���λ�Ǥ���"
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "�桼����ID��%s�ɤϡ����ʽ�̾����Ƥ��ޤ���"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2555,11 +2580,11 @@ msgstr ""
 "��%s�ɤˤ������뼫�ʽ�̾�ϡ�\n"
 "PGP 2.x�����ν�̾�Ǥ���\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "OpenPGP�μ��ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2568,11 +2593,11 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "����λ�Ǥ���\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "��������̾��ȯ�Ԥ��������ڤ��̾�ȸ򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2581,53 +2606,53 @@ msgstr ""
 "��%s�ɤˤ������뤢�ʤ��κ��ν�̾\n"
 "��������̾�Ǥ���\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "��Ф���ǽ�ʽ�̾�˳ʾ夲�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦������̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "��%s�ɤϸ�%s�Ǥ⤦��̾���Ƥ���ޤ�\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "����Ǥ�ƽ�̾�������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "��%s�ǽ�̾���٤���ΤϤ���ޤ���\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "���θ�����λ�Ǥ�!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "���θ���%s����λ���ޤ���\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Ʊ���˽�̾����λ�ˤ������Ǥ���? (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x����OpenPGP��̾���Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "���θ���PGP 2.x�ǻ��ѤǤ��ʤ��ʤ�ޤ���\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2636,32 +2661,32 @@ msgstr ""
 "��̾���褦�Ȥ��Ƥ��븰���ºݤ˾嵭��̾���οͤΤ�Τ��ɤ������ɤ�����\n"
 "���դ��Ƹ��ڤ��ޤ�����? �����狼��ʤ���С���0�ɤ����Ϥ��Ƥ���������\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �����ޤ���%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �������������Ƥ��ޤ���%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) ������������ޤ�����%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ���ʤ����դ��Ƹ������ޤ�����%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "�����? (�ܺ٤� '?' ��): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2670,75 +2695,75 @@ msgstr ""
 "�����ˤ��θ��ˤ��ʤ��θ���%s�ɤǽ�̾���Ƥ褤�Ǥ���\n"
 "(%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "�ٹ�: ��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "�ٹ�: ��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "��̾�ϡ���Ф��ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "��̾�ϡ������ԲĤ����ꤵ��ޤ���\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "���θ����������������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "���θ��ϰ�����������ޤ�����\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���θ����Խ��Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2746,11 +2771,11 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2759,175 +2784,180 @@ msgstr ""
 "�����餯����ϡ������Ǥ�ʤ����ͤ��Ǥ�!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�����κ��"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "�����������С���URI������"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�����μ���"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "���ѤǤ��ʤ���̩���Ǥ�"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2961,105 +2991,105 @@ msgstr "���ϡ���������Ƥ��ޤ���"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "�����ΰ���������:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
@@ -3173,15 +3203,13 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "��λ"
 
@@ -3202,7 +3230,7 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
@@ -3245,12 +3273,12 @@ msgstr "���������Ƥ��ޤ���\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3259,171 +3287,171 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3766,7 +3794,7 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4464,34 +4492,34 @@ msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent�ץ��ȥ��롦�С������%d�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "����������Ȥ˾㳲: ��������������Ѷػ�\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4502,27 +4530,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "�ѥ��ե졼���������\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "�Хå����⡼�ɤǥѥ��ե졼������礻�Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4531,17 +4559,17 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -5494,7 +5522,7 @@ msgstr "����Ū"
 msgid "no need for a trustdb check\n"
 msgstr "���ѥǡ����١����θ����ϡ����פǤ�\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "����ο��ѥǡ����١��������ϡ�%s�Ǥ�\n"
@@ -5522,32 +5550,32 @@ msgstr "--check-trustdb��¹Ԥ��Ƥ�������\n"
 msgid "checking the trustdb\n"
 msgstr "���ѥǡ����١����θ���\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d�ܤθ������ (����%d�ܤ�ͭ�������򥯥ꥢ)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "����Ū�˿��Ѥ��븰�����Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "����Ū�˿��Ѥ��븰%s�θ����������Ĥ���ޤ���\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "�Ǿ��Ρ֤������٤ο��ѡ�%d���Ǿ��Ρ�����Ū���ѡ�%d��%s���ѥ�ǥ�\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "����: %d  ͭ����: %3d  ��̾: %3d  ����: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5860,6 +5888,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ�������Ȥä��ΤǤ��礦)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "��%s�פ�¹ԤǤ��ޤ���: %s\n"
 
diff --git a/po/pl.po b/po/pl.po
index 3c09dc324..3661afcc7 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -40,7 +40,7 @@ msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -77,7 +77,7 @@ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -257,7 +257,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -402,7 +402,7 @@ msgid "can't do this in batch mode\n"
 msgstr "nie dzia�a w trybie wsadowym\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
@@ -470,7 +470,7 @@ msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
@@ -583,7 +583,7 @@ msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
@@ -608,7 +608,7 @@ msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 msgid "secret key already stored on a card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
@@ -617,7 +617,7 @@ msgstr "wyj�cie z tego menu"
 msgid "show admin commands"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
@@ -697,51 +697,51 @@ msgstr "zapisuj� klucz tajny w '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Powt�rz has�o: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -751,13 +751,13 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -949,27 +949,27 @@ msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� tymczasowego katalogu ,,%s'': %s.\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "klucz %08lX: nie jest chroniony - pomini�ty\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %08lX: klucz PGP 2.x - pomini�ty\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "OSTRZE�ENIE: klucz prywatny %08lX nie ma prostej sumy kontrolnej SK.\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
@@ -1185,15 +1185,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1203,7 +1203,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1211,73 +1211,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1285,21 +1285,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1307,388 +1307,388 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1696,28 +1696,28 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1726,28 +1726,28 @@ msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -2101,403 +2101,428 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o ,,%s''"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d zostaje pomini�ty\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "   pomini�tych nowych kluczy: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "      nie w��czono do zbioru: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "             nowych podpis�w: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "   tajnych kluczy wczytanych: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %08lX: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %08lX: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %08lX: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %08lX: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %08lX: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %08lX: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych podpis�w\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "klucz %08lX: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %08lX: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %08lX: klucz tajny z ustawionym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniwa�nienia\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %08lX: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %08lX: algorytm asymetryczny \"%s\" nie jest obs�ugiwany\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %08lX: niepoprawny podpis na identyfikatorze \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %08lX: nie obs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %08lX: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %08lX: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %08lX: nieoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %08lX: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %08lX: pomini�to identyfikator u�ytkownika '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasy %02x) - pomini�ty\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: pomini�to certyfikat uniewa�nienia umieszczony \n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %08lX: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %08lX: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewazniony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %08lX w serwerze kluczy\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %08lX m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %08lX.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %08lX: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %08lX: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
@@ -2522,52 +2547,52 @@ msgstr "b��d tworzenia `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[uniewa�nienie]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika niepodpisany tym samym kluczem\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika niepodpisanych tym samym kluczem\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2580,63 +2605,63 @@ msgstr ""
 "z r�nych �r�de�, dokumenty potwierdzaj�ce to�samo��, itd.).\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = mam ograniczone zaufanie\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = mam pe�ne zaufanie\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Identyfikator u�ytkownika ,,%s'' przekroczy� sw�j termin wa�no�ci."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator ,,%s'' nie jest podpisany swoim kluczem."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2645,11 +2670,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem z�o�onym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Czy chcesz zamieni� go na podpis OpenPGP? (t/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2658,11 +2683,11 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "przekroczy� dat� wa�no�ci.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Czy chcesz zast�pi� przeterminowany podpis nowym? (t/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2671,56 +2696,56 @@ msgstr ""
 "Tw�j podpis na \"%s\"\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Czy chcesz zamieni� go na pe�ny, publiczny, eksportowalny podpis? (t/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" jest ju� lokalnie podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" jest ju� podpisany kluczem %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Czy na pewno chcesz to podpisa�? (t/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Data wa�no�ci tego klucza up�yn�a!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Wa�no�� tego klucza wygasa %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Czy chcesz �eby wa�no�� Twojego podpisu wygasa�a w tej samej chwili? (T/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "W trybie --pgp2 nie mo�na podpisywa� kluczy PGP 2.x podpisami OpenPGP.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To uczyni ten klucz nieuzytecznym dla PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2729,32 +2754,32 @@ msgstr ""
 "Jak dok�adnie zosta�a przez Ciebie sprawdzona to�samo�� tej osoby?\n"
 "Je�li nie wiesz co odpowiedzie�, podaj ,,0''.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nie odpowiem na to pytanie. %s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) W og�le nie.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobie�nie.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Bardzo dok�adnie.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Tw�j wyb�r (,,?'' podaje wi�cej informacji): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2763,99 +2788,99 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "To b�dzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "OSTRZE�ENIE: podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako prywatny (nieeksportowalny).\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis zostanie oznaczony jako nie podlegaj�cy uniewa�nieniu.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika nie zosta�a w og�le sprawdzona.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a sprawdzona pobie�nie.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Cz�� tajna g��wnego klucza jest niedost�pna.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2863,11 +2888,11 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2875,177 +2900,182 @@ msgstr ""
 "Nie chcesz has�a - to *z�y* pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "uniewa�nienie podpisu"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "z�o�enie prywatnego (lokalnego) podpisu na kluczu"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: niepodpisany identyfikator u�ytkownika\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "wyznaczenie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i prywatnych"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie identyfikatora u�ytkownika"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie podklucza"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "w��czy� klucz do u�ycia"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "wy��czy� klucz z u�ycia"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "okazanie identyfikatora - zdj�cia"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "bezu�yteczny klucz prywatny"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3080,114 +3110,114 @@ msgstr "Klucz uniewa�niony."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nieznana klasa podpisu"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "b��d tworzenia zbioru kluczy `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno zaktualizowa� ustawienia klucza dla wybranych identyfikator�w? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
@@ -3305,16 +3335,14 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "data"
@@ -3337,7 +3365,7 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
@@ -3380,11 +3408,11 @@ msgstr "Nic nie zosta�o usuni�te.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3394,179 +3422,179 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczu� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony kluczem uniewa�niaj�cym!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz tego u�y�? (t/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany przez %08lX w %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zdj�cie w formacie %s, rozmiar %ld bajt�w, klucz 0x%08lX (id %d).\n"
@@ -3919,7 +3947,7 @@ msgid ""
 msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4641,34 +4669,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "wersja %d protoko�u agenta nie jest obs�ugiwana\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem z agentem - zostaje wy��czony\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (podklucz %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4679,28 +4707,28 @@ msgstr ""
 "\"%.*s\".\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, numer %08lX, stworzony %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Powt�rzone has�o\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Podaj has�o: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4710,17 +4738,17 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 "\""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %08lX, stworzony %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Powt�rz has�o: "
 
@@ -5730,7 +5758,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "sprawdzanie bazy jest niepotrzebne\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nast�pne sprawdzanie bazy odb�dzie si� %s\n"
@@ -5758,32 +5786,32 @@ msgstr "nale�y uruchomi� gpg z opcj� ,,--check-trustdb''\n"
 msgid "checking the trustdb\n"
 msgstr "sprawdzanie bazy zaufania\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "przetworzono %d kluczy (rozwi�zano %d przelicze� zaufania)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "brak absolutnie zaufanych kluczy\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "klucz publiczny absolutnie zaufanego klucza %08lX nie odnaleziony\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "wpis zaufania %lu, typ zapytania %d: zapis nie powi�d� si�: %s\n"
@@ -6097,6 +6125,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "klucz %08lX: pomini�to - nieoczekiwana klasa podpisu (%02x)\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index f02fb176f..6011107cc 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -33,7 +33,7 @@ msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -70,7 +70,7 @@ msgstr "imposs�vel ler `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -241,7 +241,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -386,7 +386,7 @@ msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Op��o? "
@@ -454,7 +454,7 @@ msgstr "a escrever chave p�blica para `%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -565,7 +565,7 @@ msgstr "   (%d) RSA (apenas cifragem)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
@@ -590,7 +590,7 @@ msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -599,7 +599,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -679,48 +679,48 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -730,13 +730,13 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -929,27 +929,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o est� protegida - ignorada\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1168,15 +1168,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1186,7 +1186,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1194,472 +1194,472 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1667,28 +1667,28 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1697,27 +1697,27 @@ msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2078,401 +2078,426 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      ignorei novas chaves: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de utilizadores: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de utilizadores: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        n�o importadas: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        novas assinaturas: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      chaves secretas lidas: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2497,51 +2522,51 @@ msgstr "erro ao criar `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de utilizador sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de utilizadores sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2554,63 +2579,63 @@ msgstr ""
 "(vendo passaportes, verificando impress�es digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Confio moderadamente\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Confio plenamente\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: o ID do utilizador \"%s\" n�o � auto-assinado.\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2619,11 +2644,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "� uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Quer promov�-la a uma auto-assinatura OpenPGP? (s/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2632,12 +2657,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 #, fuzzy
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2646,55 +2671,55 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "� uma assinatura local.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Quer promov�-la a uma assinatura export�vel? (s/N)"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" j� foi assinado localmente pela chave %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" j� foi assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave vai expirar em %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Quer que a sua assinatura expire na mesma altura? (S/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "N�o pode criar uma assinatura OpenPGP numa chave PGP 2.x no modo --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Isto tornaria a chave inutiliz�vel no PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2704,31 +2729,31 @@ msgstr ""
 "pertence\n"
 "� pessoa correcta? Se n�o sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) N�o vou responder.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) N�o verifiquei.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Verifiquei por alto.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Verifiquei com bastante cuidado.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2737,100 +2762,100 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "AVISO: a assinatura n�o ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-export�vel.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "A assinatura ser� marcada como n�o-revoc�vel.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "N�o verifiquei esta chave.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Verifiquei esta chave com muito cuidado.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2838,11 +2863,11 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2850,177 +2875,182 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "chave secreta n�o utiliz�vel"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3055,114 +3085,114 @@ msgstr "A chave est� revogada."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
@@ -3280,16 +3310,14 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3309,7 +3337,7 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
@@ -3353,12 +3381,12 @@ msgstr "Nada removido.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3367,178 +3395,178 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3892,7 +3920,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4613,34 +4641,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "a vers�o %d do protocolo gpg-agent n�o � suportada\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problema com o agente - a desactivar a utiliza��o deste\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4653,28 +4681,28 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4684,17 +4712,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -5691,7 +5719,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "n�o � necess�ria uma verifica��o da base de dados de confian�a\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "proxima verifica��o da base de dados de confian�a a %s\n"
@@ -5719,35 +5747,35 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "a verificar a base de dados de confian�a\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "chave p�blica da chave absolutamente de confian�a %08lX n�o encontrada\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registo de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6062,6 +6090,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 15a83874f..7eec9151b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -37,7 +37,7 @@ msgstr ""
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -74,7 +74,7 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, fuzzy, c-format
@@ -246,7 +246,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -391,7 +391,7 @@ msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Sua op��o? "
@@ -458,7 +458,7 @@ msgstr "escrevendo certificado p�blico para `%s'\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -571,7 +571,7 @@ msgstr "   (%d) ElGamal (apenas criptografia)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
@@ -596,7 +596,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -605,7 +605,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -686,51 +686,51 @@ msgstr "escrevendo certificado privado para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -740,13 +740,13 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -935,27 +935,27 @@ msgstr ""
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr ""
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr ""
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
@@ -1178,15 +1178,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1196,7 +1196,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1204,478 +1204,478 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr ""
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1684,31 +1684,31 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1717,27 +1717,27 @@ msgstr "a URL de pol�tica dada � inv�lida\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -2043,397 +2043,422 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, fuzzy, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, fuzzy, c-format
 msgid "          not imported: %lu\n"
 msgstr "              importados: %lu"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "        novas assinaturas: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      chaves secretas lidas: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "chave %08lX: %d novas assinaturas\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "chave %08lX: %d novas assinaturas\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "chave %08lX: %d novos IDs de usu�rios\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "chave %08lX: %d novos IDs de usu�rios\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -2458,51 +2483,51 @@ msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revoga��o]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 ID de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d IDs de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2521,172 +2546,172 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " s = Mostrar mais informa��es\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, fuzzy, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, fuzzy, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
 "is a PGP 2.x-style signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 #, fuzzy
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 #, fuzzy
 msgid "This key has expired!"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, fuzzy, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr ""
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2695,90 +2720,90 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "A assinatura ser� marcada como n�o-export�vel.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 #, fuzzy
 msgid "Secret parts of primary key are not available.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2786,12 +2811,12 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2799,177 +2824,182 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr ""
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "chave secreta incorreta"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3005,113 +3035,113 @@ msgstr "A chave � protegida.\n"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
@@ -3226,16 +3256,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3253,7 +3281,7 @@ msgid ""
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
@@ -3297,193 +3325,193 @@ msgstr "Nada removido.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3840,7 +3868,7 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr ""
@@ -4568,34 +4596,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr ""
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4607,30 +4635,30 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 #, fuzzy
 msgid "Repeat passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4640,17 +4668,17 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -5642,7 +5670,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "%s: n�o � um banco de dados de confiabilidade\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, fuzzy, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "inser��o de registro de confian�a falhou: %s\n"
@@ -5671,33 +5699,33 @@ msgstr ""
 msgid "checking the trustdb\n"
 msgstr "muda os valores de confian�a"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr ""
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 #, fuzzy
 msgid "no ultimately trusted keys found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "registro de confian�a %lu, tipo %d: escrita falhou: %s\n"
@@ -6017,6 +6045,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(voc� pode ter usado o programa errado para esta tarefa)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "imposs�vel abrir %s: %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index dcc7daaf4..05e01d0b2 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.1\n"
+"Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
-"PO-Revision-Date: 2005-03-15 12:00-0500\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
+"PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -72,7 +72,7 @@ msgstr "nu pot citi `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -141,9 +141,9 @@ msgid "failed to store the creation date: %s\n"
 msgstr "am e�uat s� stochez data cre�rii: %s\n"
 
 #: g10/app-openpgp.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "reading public key failed: %s\n"
-msgstr "citire cheii a e�uat\n"
+msgstr "citirea cheii publice a e�uat: %s\n"
 
 #: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
 msgid "response does not contain the public key data\n"
@@ -235,22 +235,22 @@ msgstr "generez o nou� cheie\n"
 
 #: g10/app-openpgp.c:1735
 msgid "creation timestamp missing\n"
-msgstr ""
+msgstr "timestamp-ul de creare lipse�te\n"
 
 #: g10/app-openpgp.c:1742
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
+msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
-msgstr "exponent public prea lung (mai mult de 32 bi�i)\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
+msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
 #: g10/app-openpgp.c:1827
 #, c-format
@@ -280,14 +280,15 @@ msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
 #: g10/app-openpgp.c:2138
-#, fuzzy, c-format
+#, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [semn�turi f�cute: %lu]"
+msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
 #: g10/app-openpgp.c:2399
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
+"verificarea PIN-ului Admin este deocamdat� interzis� prin aceast� comand�\n"
 
 #: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
@@ -385,7 +386,7 @@ msgid "can't do this in batch mode\n"
 msgstr "nu pot face acest lucru �n modul batch\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
@@ -448,7 +449,7 @@ msgstr "URL pentru a aduce cheia public�: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -552,7 +553,7 @@ msgstr "   (2) Cheie de cifrare\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
@@ -573,7 +574,7 @@ msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
@@ -581,7 +582,7 @@ msgstr "ie�i din acest meniu"
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
@@ -631,7 +632,7 @@ msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
 #: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
-msgstr ""
+msgstr "verific� PIN-ul �i listeaz� toate datele"
 
 #: g10/card-util.c:1454 g10/keyedit.c:1610
 msgid "Command> "
@@ -653,50 +654,50 @@ msgstr "Nu sunt permise comenzi administrare\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
 "renun�a: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
-"V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de seris:\n"
+"V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "Introduce�i noul PIN Admin: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "introduce�i noul PIN: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Introduce�i PIN Admin: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "Introduce�i PIN: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "Repeta�i acest PIN: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -706,13 +707,13 @@ msgstr "nu pot deschide `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -906,26 +907,26 @@ msgstr "AVERTISMENT: nu pot �terge fi�ierul temporar (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "AVERTISMENT: nu pot �terge directorul temporar `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "exportul cheilor secrete nu este permis\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "cheia %s: nu e protejat� - s�rit�\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - s�rit�\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "AVERTISMENT: cheia secret� %s nu are un checksum SK simplu\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
@@ -1139,15 +1140,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1157,7 +1158,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1165,77 +1166,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1243,21 +1244,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1265,384 +1266,384 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
-#, fuzzy, c-format
+#: g10/g10.c:2237 g10/g10.c:2249
+#, c-format
 msgid "`%s' is not a valid signature expiration\n"
-msgstr "`%s' nu este un set de carectere valid\n"
+msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/g10.c:2625
-#, fuzzy, c-format
+#: g10/g10.c:2630
+#, c-format
 msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
+msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1650,29 +1651,28 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/g10.c:3900
-#, fuzzy
+#: g10/g10.c:3905
 msgid "a notation name must not contain more than one '@' character\n"
-msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
+msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -1680,26 +1680,26 @@ msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
@@ -2072,399 +2072,424 @@ msgstr "Nici un ajutor disponibil"
 msgid "No help available for `%s'"
 msgstr "Nici un disponibil disponibil pentru `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "bloc de tip %d s�rit\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu chei procesate p�n� acum\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Num�r total procesate: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      chei noi s�rite: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "  f�r� ID-uri utilizator: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "               importate: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             neschimbate: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "   noi ID-uri utilizator: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "             noi subchei: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "           noi semn�turi: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    noi revoc�ri de chei: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chei secrete importate: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chei secrete neschimbate: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "            ne importate: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "semn�turi create p�n� acum: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "     chei secrete citite: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "algoritmuri pentru aceste ID-uri utilizator:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "cheia %s: semn�tur� expirat� de la cheia %s - s�rit�\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
@@ -2479,60 +2504,60 @@ msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
 #: g10/keydb.c:316 g10/keydb.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "keyblock resource `%s': %s\n"
-msgstr "eroare la creearea `%s': %s\n"
+msgstr "resurs� keyblock `%s': %s\n"
 
 #: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei chei lips�\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor chei lips�\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 semn�tur� nu a fost verificat� din cauza unei erori\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "am g�sit 1 ID utilizator f�r� auto-semn�tur� valid�\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "am g�sit %d ID-uri utilizator f�r� auto-semn�turi valide\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2543,17 +2568,17 @@ msgstr ""
 "pentru a verifica cheile altor utilizatori (folosind pa�apoarte,\n"
 "verific�nd amprentele din diferite surse, etc.)\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Am o �ncredere marginal�\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Am toat� �ncrederea\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2563,48 +2588,47 @@ msgstr ""
 "O ad�ncime mai mare de 1 permite ca cheia pe care o semna�i s� fac�\n"
 "semn�turi de �ncredere �n numele d-voastr�.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "V� rug�m s� introduce�i domeniul de restric�ionare al acestei semn�turi, sau "
 "ap�sa�i enter pentru niciunul.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
 
-#: g10/keyedit.c:679
-#, fuzzy, c-format
+#: g10/keyedit.c:678
+#, c-format
 msgid "User ID \"%s\" is signable.  "
-msgstr "ID-ul utilizator \"%s\" nu este auto-semnat."
+msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:681
-#, fuzzy
+#: g10/keyedit.c:680
 msgid "Sign it? (y/N) "
-msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
+msgstr "Dori�i s�-l semna�i? (d/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2613,11 +2637,11 @@ msgstr ""
 "Auto-semn�tura pe \"%s\"\n"
 "este o semn�tur� stil PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o auto-semn�tur� OpenPGP? (d/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2626,12 +2650,12 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Dori�i s� crea�i o nou� semn�tur� pentru a o �nlocui pe cea expirat�? (d/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2640,43 +2664,43 @@ msgstr ""
 "Semn�tura d-voastr� curent� pe \"%s\"\n"
 "semn�tur� local�.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Dori�i s� o promova�i la o semn�tur� total exportabil�? (d/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� local de cheia %s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" a fost deja semnat� de cheia %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Dori�i s� o semna�i oricum din nou? (d/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Aceast� cheie a expirat!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Aceast� cheie va expira pe %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Dori�i ca semn�tura d-voastr� s� expire �n acela�i timp? (D/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2684,11 +2708,11 @@ msgstr ""
 "Nu pute�i crea o semn�tur� OpenPGP pe o cheie PGP 2.x c�t� vreme sunte�i �n "
 "modul --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Aceasta va face cheia de nefolosit �n PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2699,31 +2723,31 @@ msgstr ""
 "�ntr-adev�r persoanei numite deasupra?  Dac� nu �ti�i ce s� r�spunde�i,\n"
 "introduce�i \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nu voi r�spunde.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Nu am verificat deloc.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Am f�cut ceva verific�ri superficiale.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Am f�cut verific�ri foarte atente.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Selec�ia dvs.? (introduce�i `?' pentru informa�ii suplimentare): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2732,76 +2756,76 @@ msgstr ""
 "Sunte�i �ntr-adev�r sigur(�) c� dori�i s� semna�i\n"
 "aceast� cheie cu cheia d-voastr� \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "AVERTISMENT: semn�tura nu va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Semn�tura va fi marcat� ca non-exportabil�.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Semn�tura va fi marcat� ca non-revocabil�.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Nu am verificat aceast� cheie deloc.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat aceast� cheie superficial.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat aceast� cheie foarte atent.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Cheia are numai articole de cheie sau talon (stub) pe card - nici o fraz� "
 "parol� de schimbat.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "P�r�ile secrete ale cheii primare nu sunt disponibile.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nu pot edita aceast� cheie: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2809,11 +2833,11 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2821,158 +2845,163 @@ msgstr ""
 "Nu dori�i o fraz�-parol� - aceasta este probabil o idee *proast�*!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "cheie secret� de nefolosit"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3010,105 +3039,105 @@ msgstr "Cheia este revocat�."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
@@ -3223,15 +3252,13 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "expirat�"
 
@@ -3253,7 +3280,7 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
@@ -3292,193 +3319,192 @@ msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
 #: g10/keyedit.c:3178
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": already clean.\n"
-msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
+msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
-#, fuzzy
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
-msgstr "armur� invalid�"
+msgstr "invalid(�)"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
-"AVERTISMENT: Aceasta este o cheie stil PGP 2.x.  Ad�ugarea unui "
-"revocator          desemnat poate face ca unele versiuni de PGP s� resping� "
+"AVERTISMENT: Aceasta este o cheie stil PGP 2.x.  Ad�ugarea unui revocator\n"
+"             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4080
-#, fuzzy, c-format
+#: g10/keyedit.c:4054
+#, c-format
 msgid "No user ID with hash %s\n"
-msgstr "Nici un ID utilizator cu indicele %d\n"
+msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
@@ -3678,9 +3704,9 @@ msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
 #: g10/keygen.c:1554
-#, fuzzy, c-format
+#, c-format
 msgid "Signature is valid for? (%s) "
-msgstr "Semn�tura este valid� pentru? (0) "
+msgstr "Semn�tura este valid� pentru? (%s) "
 
 #: g10/keygen.c:1572
 msgid "invalid value\n"
@@ -3820,7 +3846,7 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4149,9 +4175,9 @@ msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
 #: g10/keyserver.c:1374
-#, fuzzy, c-format
+#, c-format
 msgid "%s does not support handler version %d\n"
-msgstr "gpgkeys_%s nu suport� versiunea de manipulator (handler) %d\n"
+msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
 #: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
@@ -4447,9 +4473,9 @@ msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
 #: g10/misc.c:694
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
+msgstr "AVERTISMENT: \"%s\" este o comand� �nvechit� - nu o folosi�i\n"
 
 #: g10/misc.c:707
 msgid "Uncompressed"
@@ -4534,34 +4560,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent versiune protocol %d nu este suportat\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem� cu agentul - deactivez  folosirea agentului\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4573,28 +4599,28 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Repeta�i fraza-parol�\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
 #
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "nu pot cere fraza-parol� �n modul batch\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Introduce�i fraza-parol�: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4603,17 +4629,17 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repeta�i fraza-parol�: "
 
@@ -5598,7 +5624,7 @@ msgstr "suprem�"
 msgid "no need for a trustdb check\n"
 msgstr "nu e nevoie de o verificare trustdb\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "urm�toarea verificare trustdb programat� pe %s\n"
@@ -5626,34 +5652,34 @@ msgstr "v� rug�m face�i un --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "verific trustdb\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d chei procesate (%d num�r�tori valide anulate)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "nu am g�sit nici o cheie cu �ncredere suprem�\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "cheia public� a cheii cu �ncredere suprem� %s nu a fost g�sit�\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d marginal(e) necesare, %d complet(e) necesare, model de �ncredere %s\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "ad�nc: %d  valid: %3d  semnat: %3d  �ncredere: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5965,6 +5991,9 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(a�i folosit probabil un program nepotrivit pentru aceast� sarcin�)\n"
 
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "cheia %s: semn�tur� expirat� de la cheia %s - s�rit�\n"
+
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "nu pot executa programul `%s': %s\n"
diff --git a/po/ru.po b/po/ru.po
index 24e889d0d..cd095cbfe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2005-02-01 09:35+0300\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -31,7 +31,7 @@ msgstr "не найден модуль накопления энтропии\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,7 +67,7 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -238,7 +238,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "открытая экспонента слишком велика (более 32 бит)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -379,7 +379,7 @@ msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
@@ -442,7 +442,7 @@ msgstr "URL для получения открытого ключа: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
@@ -546,7 +546,7 @@ msgstr "   (2) Ключ шифрования\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
@@ -567,7 +567,7 @@ msgstr "секретные части ключа недоступны\n"
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
@@ -575,7 +575,7 @@ msgstr "выйти из этого меню"
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "показать данную справку"
 
@@ -647,11 +647,11 @@ msgstr "Команды администрирования не разрешен�
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -660,35 +660,35 @@ msgstr ""
 "Извлеките текущую карту и вставьте карту с серийным номером:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "Введите новый Admin PIN: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "Введите новый PIN: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Введите Admin PIN: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "Введите PIN: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "Повторите ввод PIN: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -698,13 +698,13 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -889,26 +889,26 @@ msgstr "ВНИМАНИЕ: не могу удалить временный фай
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "ВНИМАНИЕ: не могу удалить временный каталог `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "экспорт секретных ключей не разрешен\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "ключ %s: не защищен - пропущен\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: стиля PGP 2.x - пропущен\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "ВНИМАНИЕ: секретный ключ %s не имеет простой контрольной суммы SK\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
@@ -1122,15 +1122,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "О найденных ошибка сообщайте <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1140,7 +1140,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1148,92 +1148,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1241,383 +1241,383 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
 # test it
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1625,28 +1625,28 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания пользователя должно содержать '@' символ\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "имя примечания пользователя должно содержать '@' символ\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -1654,28 +1654,28 @@ msgstr "заданный URL предпочитаемого сервера кл�
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[User ID не найден]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
@@ -2038,400 +2038,425 @@ msgstr "Нет доступной справки"
 msgid "No help available for `%s'"
 msgstr "Нет справки для `%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "пропущен блок типа %d\n"
 
 # test it
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu ключей обработано\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Всего обработано: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        пропущено новых ключей: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "                   без User ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 импортировано: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  неизмененных: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "                 новых User ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "               новых подключей: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                новых подписей: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          новых отзывов ключей: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "    прочитано секретных ключей: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "импортировано секретных ключей: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " неизменённых секретных ключей: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              не импортировано: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "                новых подписей: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "    прочитано секретных ключей: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "ВНИМАНИЕ: ключ %s содержит недопустимые предпочтения\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "алгоритмы для этих User ID:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространили этот ключ, чтобы избежать потенциальных проблем несовпадения "
 "алгоритмов\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Вы можете обновить список предпочтений используя:\n"
 "\tgpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение ключа исправлено\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят без самоподписанного User ID \"%s\"\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "ключ %s: \"%s\" %d новых подписей\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "ключ %s: \"%s\" %d новых подписей\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "ключ %s: \"%s\" %d новых User ID\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "ключ %s: \"%s\" %d новых User ID\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\" \n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа для связывания подключей\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
 # test it
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "ключ %s: просрочена подпись ключом %s - пропущено\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
@@ -2456,51 +2481,51 @@ msgstr "ошибка создания `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "обнаружен 1 User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "обнаружено %d User ID без действительной самоподписи\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2512,17 +2537,17 @@ msgstr ""
 "Проверяет паспорт, сверяет отпечатки ключей и т.п.?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Доверяю ограниченно\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полностью доверяю\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2533,48 +2558,48 @@ msgstr ""
 "trust signatures on your behalf.\n"
 
 # check it
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий использование данной подписи, или пустую "
 "строку, если нет ограничений.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" просрочен."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" без самоподписи."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2583,11 +2608,11 @@ msgstr ""
 "Самоподпись у \"%s\"\n"
 "это подпись PGP 2.x -стиля.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Вы хотите сделать это OpenPGP самоподписью? (y/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2596,11 +2621,11 @@ msgstr ""
 "Ваша текущая подпись на  \"%s\"\n"
 "просрочена.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Вы хотите сделать новую подпись для замены просроченной? (y/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2609,55 +2634,55 @@ msgstr ""
 "Ваша текущая подпись на \"%s\"\n"
 "является локальной.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите сделать это полностью экспортируемой подписью? (y/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подписан ключом %s\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подписан ключом %s\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы действительно хотите снова подписать это? (y/N)"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Нечего подписывать ключом %s\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Данный ключ просрочен!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок действительности данного ключа истекает %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпись была действительна до того же времени?(Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Вы не можете сделать OpenPGP подпись на PGP 2.x ключе в режиме --pgp2.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Это сделает ключ несовместимым с PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2667,31 +2692,31 @@ msgstr ""
 "чье имя указано в User ID ключа?\n"
 "  Если Вы не знаете что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Не буду отвечать.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Я не проверял совсем.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Я проверил частично.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Я проверил очень тщательно.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ваше решение? (введите '?' для получения информации)"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2700,75 +2725,75 @@ msgstr ""
 "Вы уверены, что хотите подписать этот ключ\n"
 "своим ключом: \"%s\" (%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Это будет самоподпись.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "ВНИМАНИЕ: подпись не будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпись будет помечена как не экспортируемая.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпись будет помечена как не отзываемая.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Я совсем не проверял этот ключ.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "Я проверил этот ключ только частично.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Я очень тщательно проверил этот ключ.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Не могу редактировать данный ключ: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2776,11 +2801,11 @@ msgstr ""
 "Введите новый пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод пароля некорректен; попробуйте еще раз"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2788,155 +2813,160 @@ msgstr ""
 "Вы не хотите задать пароль? Это очень ПЛОХАЯ идея!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Вы действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранные User ID как главные"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "сменить пароль"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "непригодный закрытый ключ"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2974,102 +3004,102 @@ msgstr "Ключ отозван."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? (y/N)"
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "ошибка создания таблицы ключей `%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Невозможно присвоить степень доверия пока используется указанная "
 "пользователем таблица доверий\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения в:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
@@ -3184,15 +3214,13 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "просрочен с"
 
@@ -3214,7 +3242,7 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
@@ -3257,12 +3285,12 @@ msgstr "Ничего не удалено.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "неправильный ASCII формат"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3271,170 +3299,170 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с индексом %d\n"
 
 # c-format
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -3775,7 +3803,7 @@ msgstr ""
 "Для защиты секретного ключа необходим пароль.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4487,34 +4515,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "протокол gpg-agent версии %d не поддерживается\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "проблема с агентом - использование агента отключено\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4525,44 +4553,44 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бит %s ключ, ID %s, создан %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Повторите пароль\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Введите пароль\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Введите пароль: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "Необходим пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Повторите пароль: "
 
@@ -5543,7 +5571,7 @@ msgstr "абсолютное"
 msgid "no need for a trustdb check\n"
 msgstr "нет необходимости в проверке таблицы доверий\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "срок следующей проверки таблицы доверий %s\n"
@@ -5571,34 +5599,34 @@ msgstr "выполните --check-trustdb, пожалуйста\n"
 msgid "checking the trustdb\n"
 msgstr "проверка таблицы доверий\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d ключей обработано (%d дейсвующих записей очищено)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "не найдено абсолютно доверяемых ключей\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "открытый ключ для абсолютно доверяемого ключа %s не найден\n"
 
 # check it
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 "%d ограниченных необходимо, %d выполненных необходимо, %s модель доверия\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5911,6 +5939,9 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "ключ %s: просрочена подпись ключом %s - пропущено\n"
+
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "не могу запустить программу `%s': %s\n"
diff --git a/po/sk.po b/po/sk.po
index 42b2878ea..767dca9a2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -29,7 +29,7 @@ msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -65,7 +65,7 @@ msgstr "nem��em ��ta� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -238,7 +238,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -383,7 +383,7 @@ msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "V� v�ber? "
@@ -451,7 +451,7 @@ msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -562,7 +562,7 @@ msgstr "   (%d) RSA (len na �ifrovanie)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
@@ -587,7 +587,7 @@ msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
@@ -596,7 +596,7 @@ msgstr "ukon�i� toto menu"
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
@@ -676,48 +676,48 @@ msgstr "zapisujem tajn� k��� do `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -727,13 +727,13 @@ msgstr "nemo�no otvori� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -926,27 +926,27 @@ msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� adres�r `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "k��� %08lX: nie je chr�nen� - presko�en�\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "k��� %08lX: PGP 2.x k��� - presko�en�\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VAROVANIE: tajn� k��� %08lX nem� jednoduch� SK kontroln� s��et\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
@@ -1166,17 +1166,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1186,7 +1186,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1194,478 +1194,478 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1673,28 +1673,28 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1703,29 +1703,29 @@ msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
 # c-format
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
@@ -2083,404 +2083,429 @@ msgstr "Pomoc nie je k dispoz�cii"
 msgid "No help available for `%s'"
 msgstr "Pomoc nie je dostupn� pre '%s'"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "blok typu %d bol presko�en�\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "%lu k���e boli doteraz spracovan�\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Celkovo spracovan�ch k���ov: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      presko�en� nov� k���e: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        bez identifik�torov: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                importovan�: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                  bez zmien: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         nov� id u��vate�ov: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              nov� podk���e: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "               nov� podpisy: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      nov� revok�cie k���ov: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "    importovan� tajn� k���e: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      tajn� k���e nezmenen�: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "           neimportovan�: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "               nov� podpisy: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      pre��tan� tajn� k���e: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -2505,52 +2530,52 @@ msgstr "chyba pri vytv�ran� `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[revok�cia]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpisov neoveren�ch, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "zisten� 1 identifik�tor u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr ""
 "zisten�ch %d identifik�torov u��vate�a bez platn�ho podpisu n�m sam�m\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2563,63 +2588,63 @@ msgstr ""
 "kontrolou fingerprintov z r�znych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = D�verujem �iasto�ne\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = D�verujem �plne\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID u��vate�a \"%s\" nie je podp�san� n�m sam�m."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2628,11 +2653,11 @@ msgstr ""
 "Podpis k���a \"%s\" n�m sam�m je\n"
 "podpis vo form�te PGP 2.x.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Prajete si ho zmeni� na form�t OpenPGP? (a/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2642,11 +2667,11 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2656,54 +2681,54 @@ msgstr ""
 "je len lok�lny.\n"
 "\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Prajete si ho zmeni� na plne exportovate�n� podpis? (a/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" je u� lok�lne podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" je u� podp�san� k���om %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Ni� na podp�sanie k���om %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Platnos� k���a vypr�ala!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Platnos� k���a vypr�� %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Chcete, aby platnos� V�ho podpisu vypr�ala v rovnakom �ase? (A/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr ""
 "Nem��ete vytvori� OpenPGP podpis k���a typu PGP 2.x, ke� ste v --pgp2 m�de.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "To by sp�sobilo nepou�itelnos� k���a v PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2713,32 +2738,32 @@ msgstr ""
 "patr� vy��ie uvedenej osobe?\n"
 "Pokia� nepozn�te odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) V�bec som to nekontroloval(a).%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) �iasto�ne som to overil(a).%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Ve�mi d�kladne som to overil(a).%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "V� v�ber? ('?' - viac inform�ci�): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2747,28 +2772,28 @@ msgstr ""
 "Ste si ist�, �e chcete podp�sa� tento k���\n"
 "svoj�m k���om: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neexportovate�n�.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "VAROVANIE: podpis nebude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2776,72 +2801,72 @@ msgstr ""
 "Podpis bude ozna�en� ako neexportovate�n�.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 "\n"
 "Podpis bude ozna�en� ako neodvolate�n� (non-revocable).\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "V�bec som tento k��� neoveril.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "�iasto�ne som overil tento k���.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Velmi d�kladne som overil tento k���.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Nie je mo�n� editova� tento k���: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2849,11 +2874,11 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2861,175 +2886,180 @@ msgstr ""
 "Nechcete heslo - to je *zl�* n�pad!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "nepou�ite�n� tajn� k���"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3064,113 +3094,113 @@ msgstr "K��� revokovan�."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
@@ -3288,16 +3318,14 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3319,7 +3347,7 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
@@ -3362,12 +3390,12 @@ msgstr "Ni� nebolo zmaznan�.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3376,176 +3404,176 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3896,7 +3924,7 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4619,34 +4647,34 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokol verzie %d nie je podporovan�\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "probl�m s agentom - pou��vanie agenta vypnut�\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4657,28 +4685,28 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Opakova� heslo\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Vlo�te heslo: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4688,17 +4716,17 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Opakujte heslo: "
 
@@ -5699,7 +5727,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "nie je nutn� kontrolova� datab�zu d�very\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "dal�ia kontrola datab�zy d�very %s\n"
@@ -5727,32 +5755,32 @@ msgstr "pros�m vykonajte --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "kontrolujem datab�zu d�very\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d k���ov spracovan�ch (%d po�tov platnosti vymazan�ch)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "neboli n�jden� �iadne absol�tne d�veryhodn� k���e\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "verejn� k��� k absol�tne d�veryhodn�mu k���u  %08lX nebol n�jden�\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "z�znam d�very %lu, typ %d: z�pis zlyhal: %s\n"
@@ -6066,6 +6094,10 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
 #, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
+
+#, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
diff --git a/po/sv.po b/po/sv.po
index 3aeaaf0fd..dba998c5e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -47,7 +47,7 @@ msgstr "ingen demon för entropisamling hittad\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -83,7 +83,7 @@ msgstr "kan inte läsa \"%s\": %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -259,7 +259,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -408,7 +408,7 @@ msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Vad väljer du? "
@@ -476,7 +476,7 @@ msgstr "ingen tillhörande öppen nyckel: %s\n"
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
@@ -586,7 +586,7 @@ msgstr "   (%d) RSA (endast kryptering)\n"
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
@@ -611,7 +611,7 @@ msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 msgid "secret key already stored on a card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
@@ -620,7 +620,7 @@ msgstr "avsluta denna meny"
 msgid "show admin commands"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "visa denna hjälp"
 
@@ -699,49 +699,49 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetera lösenmeningen: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -751,13 +751,13 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -956,27 +956,27 @@ msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "VARNING: kunde inte ta bort temp-katalogen `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 #, fuzzy
 msgid "exporting secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, fuzzy, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "nyckeln %08lX är inte skyddad - hoppade över den\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, fuzzy, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %08lX: nyckel av PGP 2.x-typ - hoppade över den\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, fuzzy, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
@@ -1195,18 +1195,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera gärna fel till <[email protected]>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <[email protected]>.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1216,7 +1216,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1224,483 +1224,483 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "felaktiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1711,31 +1711,31 @@ msgstr ""
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -1744,29 +1744,29 @@ msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
 "- hoppar över\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
@@ -2141,359 +2141,389 @@ msgstr "Det finns ingen hjälp tillgänglig"
 msgid "No help available for `%s'"
 msgstr "Det finns ingen hjälp tillgänglig för \"%s\""
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "hoppar över block av typen %d\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, fuzzy, c-format
 msgid "%lu keys processed so far\n"
 msgstr "har behandlat %lu nycklar hittills\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "  Totalt antal behandlade enheter: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "          överhoppade nya nycklar: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         utan användaridentiteter: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      importerade: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      oförändrade: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          nya användaridentiteter: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                 nya undernycklar: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                   nya signaturer: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "  nya spärrar av nycklar: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      antal lästa hemliga nycklar: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "antal importerade hemliga nycklar: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "antal oförändrade hemliga nycklar: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "                   inte importerade: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "                   nya signaturer: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      antal lästa hemliga nycklar: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr ""
 
-#: g10/import.c:546
+#: g10/import.c:556
 #, fuzzy
 msgid "algorithms on these user IDs:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:714
+#: g10/import.c:748
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %08lX: HKP-skadad undernyckel har reparerats!\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:729
+#: g10/import.c:763
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: accepterade användaridentitet ID '%s' som saknar egensignatur\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %08lX: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en egensignatur\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %08lX: hittade ingen öppen nyckel: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %08lX: ny nyckel - hoppade över den\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:792
+#: g10/import.c:826
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %08lX: importerade öppen nyckel \"%s\"\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %08lX: matchar inte vår lokala kopia\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %08lX: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %08lX: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %08lX: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "nyckel %08lX: \"%s\" %d nya signaturer\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "nyckel %08lX: \"%s\" %d nya användar-IDn\n"
+
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %08lX: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "nyckel %08lX: hemlig nyckel med ogiltig krypteringsalgoritm %d - hoppade "
 "över den\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %08lX: den hemliga nyckeln är importerad\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %08lX: finns redan i den hemliga nyckelringen\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %08lX: hittade inte den hemliga nyckeln: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "nyckel %08lX: öppen nyckel saknas - kan inte spärra nyckeln med "
 "spärrcertifikatet\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %08lX: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %08lX: algoritmen för öppna nycklar stöds inte för användar-ID  \"%s"
 "\"\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %08lX: ogiltig egensignatur på användar-id \"%s\"\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "nyckel %08lX: ingen undernyckel för nyckelbindning\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %08lX: algoritmen för öppna nycklar stöds inte\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %08lX: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %08lX: tog bort multipla bindningar av undernyckel\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %08lX: ingen undernyckel för spärr av nyckeln\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %08lX: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %08lX: tog bort multipla spärrar av undernyckel\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %08lX: hoppade över användaridentitet '"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %08lX: hoppade över undernyckel\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: icke exporterbar signatur (klass %02x) - hoppade över den\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "nyckel %08lX: spärrcertifikat på fel plats - hoppade över certifikatet\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %08lX: ogiltigt spärrcertifikat: %s - hoppade över det\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
@@ -2501,56 +2531,49 @@ msgstr ""
 "signaturen\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
 
-# nyckeln eller klassen?
-#: g10/import.c:1575
-#, fuzzy, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr ""
-"nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %08lX: användaridentitet hittades flera gånger - slog ihop till en\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Hämtar spärrnyckel %08lX\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %08lX kan ha spärrats: Spärrnyckeln %08lX saknas.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %08lX: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %08lX: lagt till direkt nyckelsignatur\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
@@ -2575,51 +2598,51 @@ msgstr "Fel vid skapande av `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 användaridentitet utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d användaridentiteter utan giltig egensignatur hittades\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -2633,63 +2656,63 @@ msgstr ""
 "källor...)?\n"
 "\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, fuzzy, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Jag litar marginellt på denna användare\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Jag litar fullständigt på denna användare\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 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:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Giltighetstiden för nvändar-ID \"%s\" har gått ut.."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användar-ID \"%s\" saknar egensignatur."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2698,11 +2721,11 @@ msgstr ""
 "Egensignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Will du göra om den till en egensignatur av OpenPGP-typ? (j/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2711,13 +2734,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Vill du skapa en ny signatur som ersätter den vars giltighetstid gått ut? (J/"
 "n) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2726,44 +2749,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Vill du ändra den till en fullständigt exporterbar signatur? (j/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" var redan signerad lokalt av nyckeln %08lX\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" var redan signerad av nyckeln %08lX\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Vill du verkligen signera den igen ändå?(j/N)"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Det finns inget att signera med nyckeln %08lX\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Denna nyckels giltighetstid går ut vid %s.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Vill du att giltighetstiden för signaturen ska upphöra vid samma tid? (J/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2771,11 +2794,11 @@ msgstr ""
 "Du kan inte göra en OpenPGP-signatur på en PGP 2.x-nyckel när du är i --pgp2-"
 "läge\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Detta skulle göra nyckeln oanvändbar i PGP 2.x.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2784,33 +2807,33 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 "     (0) Jag vill inte ange hur noga jag har kontrollerat identiteten.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "     (1) Jag har inte kontrollerat identiteten alls.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "     (2) Jag har gjort viss kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "     (3) Jag har gjort en noggrann kontroll av identiteten.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 #, fuzzy
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Ditt val? (skriv '?' för mer information): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2819,14 +2842,14 @@ msgstr ""
 "Är du verkligen säker på att du vill signera denna nyckel\n"
 "med din nyckel: \""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Detta kommer att bli en egensignatur\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
@@ -2834,7 +2857,7 @@ msgstr ""
 "VARNING: signaturen kommer att markeras som exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -2842,7 +2865,7 @@ msgstr ""
 "VARNING: Signaturen kommer att markeras som möjlig att spärra.\n"
 "\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -2850,7 +2873,7 @@ msgstr ""
 "Signaturen kommer att markeras som icke exporterbar.\n"
 "\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -2858,65 +2881,65 @@ msgstr ""
 "Signaturen kommer att markeras som icke möjlig att återkalla.\n"
 "\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Jag har inte kontrollerat identiteten alls.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Jag har gjort viss kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Jag har gjort en noggrann kontroll av identiteten.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "De hemliga delarna av den huvudnyckeln är inte tillgängliga.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Kan inte redigera denna nyckel: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2924,11 +2947,11 @@ msgstr ""
 "Skriv in den nya lösenmening för denna hemliga nyckel.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2936,178 +2959,183 @@ msgstr ""
 "Du vill inte ha någon lösenmening - detta är sannolikt en *dålig* idé!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 #, fuzzy
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "visa fingeravtryck"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "visa en lista på nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 #, fuzzy
 msgid "select subkey N"
 msgstr "välj användaridentitet N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 #, fuzzy
 msgid "check signatures"
 msgstr "återkalla signaturer"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signera nyckeln lokalt"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Tips: Välj de användarID:n du vill signera\n"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "lägg till ett foto som användaridentitet"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "ta bort en användaridentitet"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "ta bort en undernyckel"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "markera användaridentiteten som huvudidentitet"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "hoppa mellan att visa en lista på hemliga eller öppna nycklar"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "visa en lista på  inställningar (expertläge)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "visa en lista på inställningar (utförligt)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 #, fuzzy
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "ändra lösenmening"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "spärra en användaridentitet"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "spärra en undernyckel"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 #, fuzzy
 msgid "enable key"
 msgstr "aktivera en nyckel"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "disable key"
 msgstr "stäng av en nyckel"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "visa foto-ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "oanvändbar hemlig nyckel"
+
 #: g10/keyedit.c:1557
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -3142,114 +3170,114 @@ msgstr "Nyckeln är spärrad."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "okänd signaturklass"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fel vid skapande av nyckelringen \"%s\": %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda nycklarna? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen ändra inställningarna för de valda användaridentiteterna? "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
@@ -3368,16 +3396,14 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -3401,7 +3427,7 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
@@ -3445,12 +3471,12 @@ msgstr "Ingenting raderat.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "felaktigt skal"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3459,33 +3485,33 @@ msgstr ""
 "VARNING: Detta är en PGP 2-nyckel. Om du anger en spärrnyckel kan denna "
 "nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte ange en spärrnyckel för en PGP 2-nyckel.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats med sin spärrnyckel!\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ändra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3493,152 +3519,152 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3 egensignatur på användar-id \"%s\"\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen använda det (j/N)?"
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "\"\n"
 "signerad med din nyckel %08lX %s\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? (j/N)"
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på ett användar-ID är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-ID med storleken %ld för nyckeln 0x%08lX (uid %d)\n"
@@ -3992,7 +4018,7 @@ msgstr ""
 "Du behöver en lösenmening för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4719,34 +4745,34 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "GPG-Agent protokoll version %d stöds inte\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "problem med GPG-Agent, stänger av den\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (huvudnyckelns identitet %08lX)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4757,28 +4783,28 @@ msgstr ""
 "användaren: \"%.*s\"\n"
 "%u-bitars %s-nyckel, ID %08lX, skapad %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Repetera lösenmeningen\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Ange lösenmening\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 #, fuzzy
 msgid "can't query passphrase in batch mode\n"
 msgstr "kan inte fråga efter lösenmening i batch-läge\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Ange lösenmening: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4788,17 +4814,17 @@ msgstr ""
 "Du behöver en lösenmening för att låsa upp den hemliga nyckeln för\n"
 "användaren: \""
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Repetera lösenmeningen: "
 
@@ -5838,7 +5864,7 @@ msgstr ""
 msgid "no need for a trustdb check\n"
 msgstr "det behövs ingen kontroll av tillitsdatabasen\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "nästa kontroll av tillitsdatabasen kommer att äga rum %s\n"
@@ -5868,34 +5894,34 @@ msgid "checking the trustdb\n"
 msgstr "kontrollerar  tillitsdatabasen\n"
 
 # Vad är detta!?
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d nycklar behandlade (%d validity counts rensade)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "hittade inga nycklar med förbehållslöst förtroende\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, fuzzy, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr ""
 "Hittar inte den öppna nyckeln tillhörande den förbehållslöst betrodda "
 "nyckeln %08lX \n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr ""
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, fuzzy, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "tillitspost: %lu, typ %d: kunde inte skriva: %s\n"
@@ -6209,6 +6235,12 @@ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
+# nyckeln eller klassen?
+#, fuzzy
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr ""
+#~ "nyckel %08lX: oväntad signaturklass  (0x%02X) - hoppade över signaturen\n"
+
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "Kunde inte köra %s \"%s\": %s\n"
diff --git a/po/tr.po b/po/tr.po
index 9a5dffb73..a596912e5 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -31,7 +31,7 @@ msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -67,7 +67,7 @@ msgstr "\"%s\" okunamıyor: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -238,7 +238,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "genel üs çok büyük (32 bitten fazla)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -379,7 +379,7 @@ msgid "can't do this in batch mode\n"
 msgstr "bu önceden betik kipinde yapılamaz\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "Seçiminiz? "
@@ -442,7 +442,7 @@ msgstr "genel anahtarın alınacağı URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
@@ -546,7 +546,7 @@ msgstr "   (2) Şifreleme anahtarı\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
@@ -567,7 +567,7 @@ msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
@@ -575,7 +575,7 @@ msgstr "bu menüden çık"
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "bunu gösterir"
 
@@ -647,12 +647,12 @@ msgstr "Yönetici komutlarına izin verilmez\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' tuşlayın: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -662,35 +662,35 @@ msgstr ""
 "   %.*s\n"
 "olan kartı yerleştirin.\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "Yeni Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "Yeni PIN'i girin: "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "PIN'i girin: "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "Bu PIN'i tekrarlayın: "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -700,13 +700,13 @@ msgstr "`%s' açılamadı\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -897,26 +897,26 @@ msgstr "UYARI: geçici dosya silinemiyor (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "UYARI: %s geçici dizini silinemiyor: %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "gizli anahtarların ihracına izin verilmez\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "anahtar %s: korunmamış - atlandı\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
@@ -1130,17 +1130,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <[email protected]> adresine,\n"
 "çeviri hatalarını ise <[email protected]> adresine bildiriniz.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1150,7 +1150,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1158,459 +1158,459 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1618,28 +1618,28 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -1647,28 +1647,28 @@ msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
@@ -2023,406 +2023,431 @@ msgstr "yardım mevcut değil"
 msgid "No help available for `%s'"
 msgstr "\"%s\" için yardım mevcut değil"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "%d. tür blok atlandı\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "şu ana kadar %lu anahtar işlendi\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "İşlenmiş toplam miktar: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "     yeni anahtarlar atlandı: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         kullanıcı kimliksiz: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      alınan: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   değişmedi: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      yeni kullanıcı kimliği: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "    yeni yardımcı anahtarlar: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                yeni imzalar: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "      yeni anahtar iptalleri: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     gizli anahtarlar okundu: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  gizli anahtarlar indirildi: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "  gizli anahtarlar değişmedi: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "             alınamadı: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "     gizli anahtarlar okundu: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "UYARI: anahtar %s kullanılabilir olmayan tercihler içeriyor\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "Bu kullanıcı kimlikler için algoritmalar:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özümleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtar zincirine yazarken hata oluştu: %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "anahtar %s: \"%s\" %d yeni imza\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "anahtar %s: \"%s\" %d yeni imza\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "anahtar %s: %s anahatarındaki imza zamanaşımına uğramış - atlandı\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
@@ -2446,51 +2471,51 @@ msgstr "`%s' oluşturulurken hata: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri belleği yeniden oluşturulurken hata: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d imza kayıp bir anahtar yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "1 öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "%d öz-imzası geçersiz kullanıcı kimliği saptandı\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2501,17 +2526,17 @@ msgstr ""
 "derecesine lütfen karar verin. (pasportuna mı bakarsınız yoksa farklı\n"
 "kaynaklardan parmakizlerini mi kontrol edersiniz...) kararınızı verin\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr " %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Tamamen güveniyorum\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2521,46 +2546,46 @@ msgstr ""
 "1'den büyük bir derinlik, imzaladığınız anhatarın kendi yararınıza\n"
 "güvence imzaları yapmayı mümkün kılar.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "Bu imzayı kısıtlayacak bir etki alanı girin, yoksa <enter> tuşlayın.\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" zamanaşımına uğradı."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" öz-imzalı değil."
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2569,11 +2594,11 @@ msgstr ""
 "\"%s\" üzerindeki öz-imza\n"
 "bir PGP 2.x tarzı imza.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "Bir OpenPGP öz-imzası haline getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2582,12 +2607,12 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Yeni imzanızın süresi dolmuş biriyle değiştirilmesini ister misiniz? (e/H) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2596,44 +2621,44 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "dahili bir imza.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın dışarda da geçerli hale getirilmesini istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla yerel olarak imzalanmış\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" zaten %s anahtarıyla imzalanmış\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitiyor.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "İmzanızın da bu kadar süre geçerli olmasını ister misiniz? (E/h) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
@@ -2641,11 +2666,11 @@ msgstr ""
 "--pgp2 kipinde bir PGP 2.x anahtarlara bir OpenPGP imzası "
 "uygulanamayabilir.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "Bu, anahtarı PGP 2.x için kullanışsız yapacak.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2654,31 +2679,31 @@ msgstr ""
 "Bu anahtarın ismi yukarda yazılı kişiye ait olduğunu ne kadar dikkatli\n"
 "doğruladınız?  Bu sorunun cevabını bilmiyorsanız \"0\" yazın.\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Cevabı bilmiyorum. %s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Tamamen kontrol edildi.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) İlişkisel denetim yaptım.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatli bir denetim yaptım.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2688,76 +2713,76 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz-imza olacak.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: imza dışarı gönderilemez olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: imza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışarı gönderilemez olarak imlenecek.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "İmza yürürlükten kaldırılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "Her şeyiyle bu anahtarı sınayamadım.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı karşılaştırmalı olarak sınadım.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar sadece kısa veya karta özel öğeler içeriyor,\n"
 "değiştirilecek bir anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Asıl anahtarın gizli parçaları kullanılamaz.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Bu anahtar üzerinde düzenleme yapılamaz: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2765,13 +2790,13 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
 "tekrarlanacak"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2779,160 +2804,165 @@ msgstr ""
 "Bir anahtar parolası vermediniz - bu çok *kötü* bir fikir!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "gizli anahtar kullanımdışı"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2970,114 +3000,114 @@ msgstr "Anahtar yürürlükten kaldırıldı."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr "Komut argüman olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
@@ -3194,15 +3224,13 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
@@ -3224,7 +3252,7 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
@@ -3267,12 +3295,12 @@ msgstr "Hiçbir şey silinmedi.\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "geçersiz zırh"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3282,182 +3310,182 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3802,7 +3830,7 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4512,34 +4540,34 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent protokolü sürüm %d desteklenmiyor\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "vekil ile problem - vekil kullanımı iptal ediliyor\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4550,27 +4578,27 @@ msgstr ""
 "kullanıcısının gizli anahtarını açacak bir anahtar parolasına ihtiyaç var.\n"
 "%u bitlik %s anahtarı, kimlik %s, oluşturma tarihi %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "Parolayı tekrar yazınız\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "betik kipinde parola sorgulanamaz\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4579,17 +4607,17 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "Tekrar: "
 
@@ -5578,7 +5606,7 @@ msgstr "son derece"
 msgid "no need for a trustdb check\n"
 msgstr "bir güvence veritabanı denetimi gereksiz\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "sonraki güvence veritabanı denetimi %s de\n"
@@ -5606,26 +5634,26 @@ msgstr "lütfen bir --check-trustdb yapın\n"
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "%d anahtar işlendi (%d doğrulama temizlendi)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "son derece güvenli bir anahtar yok\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "son derece güvenli %s için genel anahtar yok\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d şöyle böyle gerekli, %d tamamen gerekli, %s güvence modeli\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
@@ -5633,7 +5661,7 @@ msgstr ""
 "derinlik: %d  geçerli: %3d  imzalı: %3d  güvenilir: %d-, %dq, %dn, %dm, %df, "
 "%du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr ""
@@ -5946,6 +5974,9 @@ msgstr "güvenli bellek hazırlanmadan işlem yapmak mümkün değil\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(bu görev için yanlış program kullanmış olabilirsiniz)\n"
 
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "anahtar %s: %s anahatarındaki imza zamanaşımına uğramış - atlandı\n"
+
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr " '%s' çalıştırılamıyor: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 91c8d264a..3ada61956 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
 "PO-Revision-Date: 2005-03-17 22:24+0800\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -35,7 +35,7 @@ msgstr "检测不到熵搜集模块\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -71,7 +71,7 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -240,7 +240,7 @@ msgstr ""
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "公钥指数太大(超过 32 位)\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
@@ -379,7 +379,7 @@ msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "您的选择？ "
@@ -442,7 +442,7 @@ msgstr "获取公钥的 URL："
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -546,7 +546,7 @@ msgstr "  (2) 加密密钥\n"
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
@@ -567,7 +567,7 @@ msgstr "私钥部分不可用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -575,7 +575,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -647,11 +647,11 @@ msgstr "不允许使用管理员命令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "请插入卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -660,35 +660,35 @@ msgstr ""
 "请取出当前的卡，并插入有下列序列号的卡：\n"
 "  %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "就绪后请回车，或输入‘c’取消"
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "输入新的管理员 PIN："
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "输入新的 PIN："
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "再次输入此 PIN："
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -698,13 +698,13 @@ msgstr "无法打开‘%s’\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -885,27 +885,27 @@ msgstr "警告：无法删除临时文件(%s)‘%s’：%s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "密钥 %s：未被保护――已跳过\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥――已跳过\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
@@ -1119,17 +1119,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "请向 <[email protected]> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1139,7 +1139,7 @@ msgstr ""
 "签字、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1147,485 +1147,485 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
+#: g10/g10.c:2237 g10/g10.c:2249
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/g10.c:2625
+#: g10/g10.c:2630
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/g10.c:3900
+#: g10/g10.c:3905
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -1633,26 +1633,26 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
@@ -1992,323 +1992,353 @@ msgstr "没有可用的帮助"
 msgid "No help available for `%s'"
 msgstr "‘%s’没有可用的帮助"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 样式的区块\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 把密钥\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "合计被处理的数量：%lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "  已跳过的新密钥：%lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    遗失用户标识：%lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "          已导入：%lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          未改变：%lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      新用户标识：%lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "        新的子钥：%lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签字：%lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "    新的密钥吊销：%lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "      导入的私钥：%lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    未改变的私钥：%lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "        未被导入：%lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "目前已创建的签字：%lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "      读取的私钥：%lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "算法：\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签字的用户标识“%s”\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签字所致\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签字\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签字\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的签字\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的签字\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签字没有用户标识\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签字无效\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子钥\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -2317,70 +2347,65 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签字(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签字位置错误――已跳过\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签字验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "密钥 %s：来自密钥 %s 的已过期签字――已跳过\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签字\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
@@ -2404,51 +2429,51 @@ msgstr "建立‘%s’时发生错误：%s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[吊销]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自身签字]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 个损坏的签字\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 个损坏的签字\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份签字因为遗失密钥而未被检查\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份签字因为某个错误而未被检查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份签字因为某些错误而未被检查\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "检测到 1 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "检测到 %d 个没有有效自身签字的用户标识\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2459,17 +2484,17 @@ msgstr ""
 "查\n"
 "指纹等)？\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉强相信\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2478,46 +2503,46 @@ msgstr ""
 "请输入这份信任签字的深度。\n"
 "深度若大于 1 则您将签字的这把密钥将可以以您的名义做出信任签字。\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入这份签字的限制域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签字吗？(y/N)"
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签字。\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识“%s”已过期。"
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:679
+#: g10/keyedit.c:678
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "警告：用户标识“%s”不含自身签字。"
 
-#: g10/keyedit.c:681
+#: g10/keyedit.c:680
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2526,75 +2551,75 @@ msgstr ""
 "“%s”的自身签字是 PGP 2.x 样\n"
 "式的签字。\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "您是否想要将它升级成 OpenPGP 的自身签字？(y/N)"
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您目前为“%s”的签字已经过期了。\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "您想要发布一份新的签字来取代已过期的那一个吗？(y/N)"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目前为“%s”的签字是一份本地签字。\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是否想要把它升级成可以完全导出的签字？(y/N)"
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s”已由密钥 %s 在本地签字\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s”已由密钥 %s 签字\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您仍然想要为它再次签字吗？(y/N)"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西可以让密钥 %s 签字\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "这把密钥已经过期！"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这把密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想要让您的签字也同时过期吗？ (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "您不能在 --pgp2 模式下，用 PGP 2.x 密钥生成 OpenPGP 签字。\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "这会让这把密钥在 PGP 2.x 模式下不可使用。\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2603,31 +2628,31 @@ msgstr ""
 "您是否谨慎地检查过，确认正要签字的密钥的确属于以上它所声称的所有者呢？\n"
 "如果您不知道这个问题的答案，请输入“0”。\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答。 %s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我随意检查过。 %s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地检查过。 %s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "您的选择？(输入‘?’以获得更多的信息)："
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2636,74 +2661,74 @@ msgstr ""
 "您真的确定要签字这把密钥，使用您的密钥\n"
 "“%s”(%s)\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "这将是一个自身签字。\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签字不会被标记为不可导出。\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签字不会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签字会被标记成不可导出。\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签字会被标记成不可吊销。\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这把密钥。\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "我随意检查过这把密钥。\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地检查过这把密钥。\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "真的要签字吗？(y/N)"
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签字时失败： %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "只有占位密钥，或者密钥存储在卡上——没有密码可以更改。\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "无法编辑这把密钥： %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2711,11 +2736,11 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2723,154 +2748,159 @@ msgstr ""
 "您不想要用密码――这大概是个坏主意！\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签字移动到正确的位置去\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "检查签字"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签字[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签字"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签字"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签字"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签字"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签字"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "不可用的私钥"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2907,100 +2937,100 @@ msgstr "密钥已被吊销。"
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签字吗？(y/N)"
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签字类型‘%s’\n"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
@@ -3112,15 +3142,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "已过期"
 
@@ -3140,7 +3168,7 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
@@ -3183,12 +3211,12 @@ msgstr "没有东西被删除。\n"
 msgid "User ID \"%s\": already clean.\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 #, fuzzy
 msgid "invalid"
 msgstr "无效的 ASCII 封装格式"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3197,175 +3225,175 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签字\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4080
+#: g10/keyedit.c:4054
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签字\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签字已在 %s 过期。\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签字生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签字：\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签字：\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签字的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -3706,7 +3734,7 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4402,34 +4430,34 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "不支持 gpg-agent 协议版本 %d\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4440,44 +4468,44 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "请再输入一次密码\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "在批处理模式中无法查询密码\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "请输入密码："
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "请再输入一次密码："
 
@@ -5420,7 +5448,7 @@ msgstr "绝对"
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
@@ -5448,33 +5476,33 @@ msgstr "请执行一次 --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已经处理了 %d 把密钥(共计已解决了 %d 份的有效性)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "没有找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任的密钥 %s 的公钥未被找到\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "需要 %d 份勉强信任和 %d 份完全信任，%s 信任模型\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr ""
 "深度：%d 有效性：%3d 已签字：%3d 信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -5784,6 +5812,9 @@ msgstr "安全内存未初始化，不能进行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(您可能使用了错误的程序来完成此项任务)\n"
 
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "密钥 %s：来自密钥 %s 的已过期签字――已跳过\n"
+
 #, fuzzy
 #~ msgid "Unable to clean `%s'\n"
 #~ msgstr "无法执行程序‘%s’：%s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 092ee8b48..77a5dbe56 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg 1.4.1\n"
+"Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2005-05-31 11:45+0200\n"
-"PO-Revision-Date: 2005-03-16 12:22+0800\n"
+"POT-Creation-Date: 2005-06-20 19:04+0200\n"
+"PO-Revision-Date: 2005-06-21 01:35+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr "偵測不到亂數蒐集模組\n"
 
 #: cipher/random.c:388 g10/card-util.c:675 g10/card-util.c:744
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:182 g10/encode.c:482
-#: g10/g10.c:970 g10/g10.c:3257 g10/import.c:179 g10/keygen.c:2252
+#: g10/g10.c:971 g10/g10.c:3262 g10/import.c:185 g10/keygen.c:2252
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:337
 #: g10/plaintext.c:472 g10/sign.c:781 g10/sign.c:935 g10/sign.c:1048
 #: g10/sign.c:1198 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
@@ -69,7 +69,7 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:969 g10/keygen.c:2731
+#: cipher/random.c:474 g10/exec.c:478 g10/g10.c:970 g10/keygen.c:2731
 #: g10/keygen.c:2761 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:352 g10/sign.c:799 g10/sign.c:1064 g10/tdbio.c:536
 #, c-format
@@ -135,9 +135,9 @@ msgid "failed to store the creation date: %s\n"
 msgstr "存放創生資料失敗: %s\n"
 
 #: g10/app-openpgp.c:977
-#, fuzzy, c-format
+#, c-format
 msgid "reading public key failed: %s\n"
-msgstr "讀取金鑰時失敗\n"
+msgstr "讀取公鑰時失敗: %s\n"
 
 #: g10/app-openpgp.c:985 g10/app-openpgp.c:1910
 msgid "response does not contain the public key data\n"
@@ -229,22 +229,22 @@ msgstr "正在產生新的金鑰\n"
 
 #: g10/app-openpgp.c:1735
 msgid "creation timestamp missing\n"
-msgstr ""
+msgstr "建立的時間戳印缺漏\n"
 
 #: g10/app-openpgp.c:1742
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
+msgstr "RSA 模組缺漏或者尺寸並非 %d 位元\n"
 
 #: g10/app-openpgp.c:1749
 #, fuzzy, c-format
-msgid "RSA public exponent missing or largerr than %d bits\n"
-msgstr "公用指數太大 (超過 32 位元)\n"
+msgid "RSA public exponent missing or larger than %d bits\n"
+msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
 #: g10/app-openpgp.c:1757 g10/app-openpgp.c:1764
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
-msgstr ""
+msgstr "RSA 質數 %s 缺漏或者尺寸並非 %d 位元\n"
 
 #: g10/app-openpgp.c:1827
 #, c-format
@@ -274,14 +274,14 @@ msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
 #: g10/app-openpgp.c:2138
-#, fuzzy, c-format
+#, c-format
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
-msgstr "PIN [簽署完成: %lu]"
+msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
 #: g10/app-openpgp.c:2399
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
-msgstr ""
+msgstr "管理者個人識別碼 (PIN) 之驗證目前在此指令中被禁止了\n"
 
 #: g10/app-openpgp.c:2470 g10/app-openpgp.c:2480
 #, c-format
@@ -377,7 +377,7 @@ msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
 #: g10/card-util.c:104 g10/card-util.c:1129 g10/card-util.c:1212
-#: g10/keyedit.c:421 g10/keyedit.c:442 g10/keyedit.c:456 g10/keygen.c:1290
+#: g10/keyedit.c:420 g10/keyedit.c:441 g10/keyedit.c:455 g10/keygen.c:1290
 #: g10/keygen.c:1355
 msgid "Your selection? "
 msgstr "妳要選哪一個? "
@@ -440,7 +440,7 @@ msgstr "取回公鑰的 URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字元).\n"
 
-#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:262
+#: g10/card-util.c:684 g10/card-util.c:753 g10/import.c:268
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時發生錯誤: %s\n"
@@ -544,7 +544,7 @@ msgstr "   (2) 加密用金鑰\n"
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:940
+#: g10/card-util.c:1140 g10/card-util.c:1223 g10/keyedit.c:939
 #: g10/keygen.c:1394 g10/revoke.c:643
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
@@ -565,7 +565,7 @@ msgstr "私鑰部分無法取用\n"
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放於卡片上了\n"
 
-#: g10/card-util.c:1316 g10/keyedit.c:1350
+#: g10/card-util.c:1316 g10/keyedit.c:1349
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -573,7 +573,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1319 g10/keyedit.c:1353
+#: g10/card-util.c:1319 g10/keyedit.c:1352
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -623,7 +623,7 @@ msgstr "變更或解凍個人識別碼 (PIN) 的選單"
 
 #: g10/card-util.c:1334
 msgid "verify the PIN and list all data"
-msgstr ""
+msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
 #: g10/card-util.c:1454 g10/keyedit.c:1610
 msgid "Command> "
@@ -645,11 +645,11 @@ msgstr "未允許使用管理者指令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/cardglue.c:430
+#: g10/cardglue.c:431
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:553
+#: g10/cardglue.c:554
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -658,35 +658,35 @@ msgstr ""
 "請移除現用中的卡片並插入下列序號的卡片:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:561
+#: g10/cardglue.c:562
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:886
+#: g10/cardglue.c:887
 msgid "Enter New Admin PIN: "
 msgstr "請輸入新的管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:887
+#: g10/cardglue.c:888
 msgid "Enter New PIN: "
 msgstr "請輸入新的個人識別碼 (PIN): "
 
-#: g10/cardglue.c:888
+#: g10/cardglue.c:889
 msgid "Enter Admin PIN: "
 msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:889
+#: g10/cardglue.c:890
 msgid "Enter PIN: "
 msgstr "請輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:906
+#: g10/cardglue.c:907
 msgid "Repeat this PIN: "
 msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:920
+#: g10/cardglue.c:921
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3607 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:158 g10/g10.c:3612 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:155
 #, c-format
 msgid "can't open `%s'\n"
@@ -696,13 +696,13 @@ msgstr "無法開啟 `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:75 g10/export.c:170 g10/keyedit.c:3381 g10/keyserver.c:1541
+#: g10/delkey.c:75 g10/export.c:175 g10/keyedit.c:3355 g10/keyserver.c:1541
 #: g10/revoke.c:227
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:200 g10/import.c:2301 g10/keyserver.c:1555
+#: g10/delkey.c:83 g10/export.c:205 g10/import.c:2333 g10/keyserver.c:1555
 #: g10/revoke.c:233 g10/revoke.c:440
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -883,27 +883,27 @@ msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
 msgid "WARNING: unable to remove temp directory `%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 `%s': %s\n"
 
-#: g10/export.c:184
+#: g10/export.c:189
 msgid "exporting secret keys not allowed\n"
 msgstr "未被允許匯出私鑰\n"
 
-#: g10/export.c:213
+#: g10/export.c:218
 #, c-format
 msgid "key %s: not protected - skipped\n"
 msgstr "金鑰 %s: 未被保護 - 已跳過\n"
 
-#: g10/export.c:221
+#: g10/export.c:226
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 樣式的金鑰 - 已跳過\n"
 
 #  I hope this warning doesn't confuse people.
-#: g10/export.c:398
+#: g10/export.c:404
 #, c-format
 msgid "WARNING: secret key %s does not have a simple SK checksum\n"
 msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 
-#: g10/export.c:430
+#: g10/export.c:436
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
@@ -1117,15 +1117,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/g10.c:724 g10/gpgv.c:98
+#: g10/g10.c:725 g10/gpgv.c:98
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "請向 <[email protected]> 回報程式瑕疵.\n"
 
-#: g10/g10.c:741
+#: g10/g10.c:742
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/g10.c:744
+#: g10/g10.c:745
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1135,7 +1135,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/g10.c:755
+#: g10/g10.c:756
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1143,485 +1143,484 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/g10.c:758
+#: g10/g10.c:759
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/g10.c:764 g10/keyedit.c:2252
+#: g10/g10.c:765 g10/keyedit.c:2252
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/g10.c:770
+#: g10/g10.c:771
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/g10.c:776 g10/keyedit.c:2298
+#: g10/g10.c:777 g10/keyedit.c:2298
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/g10.c:859
+#: g10/g10.c:860
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/g10.c:1007
+#: g10/g10.c:1008
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/g10.c:1025
+#: g10/g10.c:1026
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/g10.c:1222
+#: g10/g10.c:1223
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1225
+#: g10/g10.c:1226
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1228
+#: g10/g10.c:1229
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/g10.c:1234
+#: g10/g10.c:1235
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1237
+#: g10/g10.c:1238
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1241
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/g10.c:1246
+#: g10/g10.c:1247
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1249
+#: g10/g10.c:1250
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1252
+#: g10/g10.c:1253
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/g10.c:1258
+#: g10/g10.c:1259
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1261
+#: g10/g10.c:1262
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1265
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/g10.c:1405
+#: g10/g10.c:1406
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/g10.c:1802
+#: g10/g10.c:1803
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/g10.c:1844
+#: g10/g10.c:1845
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/g10.c:1848
+#: g10/g10.c:1849
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/g10.c:1855
+#: g10/g10.c:1856
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/g10.c:2069 g10/g10.c:2613 g10/g10.c:2632
+#: g10/g10.c:2070 g10/g10.c:2618 g10/g10.c:2637
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/g10.c:2082
+#: g10/g10.c:2083
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/g10.c:2236 g10/g10.c:2248
-#, fuzzy, c-format
+#: g10/g10.c:2237 g10/g10.c:2249
+#, c-format
 msgid "`%s' is not a valid signature expiration\n"
-msgstr "`%s' 不是一個有效的字元集\n"
+msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/g10.c:2321
+#: g10/g10.c:2322
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/g10.c:2340 g10/keyedit.c:3897
+#: g10/g10.c:2341 g10/keyedit.c:3871
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/g10.c:2346
+#: g10/g10.c:2347
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/g10.c:2349
+#: g10/g10.c:2350
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/g10.c:2356
+#: g10/g10.c:2357
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/g10.c:2359
+#: g10/g10.c:2360
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/g10.c:2366
+#: g10/g10.c:2367
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/g10.c:2369
+#: g10/g10.c:2370
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/g10.c:2376
+#: g10/g10.c:2377
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/g10.c:2379
+#: g10/g10.c:2380
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/g10.c:2401
+#: g10/g10.c:2402
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/g10.c:2404
+#: g10/g10.c:2405
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/g10.c:2411
+#: g10/g10.c:2412
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/g10.c:2602
+#: g10/g10.c:2607
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/g10.c:2606
+#: g10/g10.c:2611
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/g10.c:2615
+#: g10/g10.c:2620
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/g10.c:2618
+#: g10/g10.c:2623
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/g10.c:2625
-#, fuzzy, c-format
+#: g10/g10.c:2630
+#, c-format
 msgid "NOTE: %s is not available in this version\n"
-msgstr "gpg-agent 在此階段無法使用\n"
+msgstr "注意: %s 在本版中無法使用\n"
 
-#: g10/g10.c:2640
+#: g10/g10.c:2645
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/g10.c:2654
+#: g10/g10.c:2659
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/g10.c:2660
+#: g10/g10.c:2665
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/g10.c:2666
+#: g10/g10.c:2671
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/g10.c:2679
+#: g10/g10.c:2684
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/g10.c:2746 g10/g10.c:2770
+#: g10/g10.c:2751 g10/g10.c:2775
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/g10.c:2752 g10/g10.c:2776
+#: g10/g10.c:2757 g10/g10.c:2781
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/g10.c:2758
+#: g10/g10.c:2763
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/g10.c:2764
+#: g10/g10.c:2769
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/g10.c:2779
+#: g10/g10.c:2784
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/g10.c:2781
+#: g10/g10.c:2786
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/g10.c:2783
+#: g10/g10.c:2788
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/g10.c:2785
+#: g10/g10.c:2790
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/g10.c:2787
+#: g10/g10.c:2792
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/g10.c:2790
+#: g10/g10.c:2795
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/g10.c:2794
+#: g10/g10.c:2799
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/g10.c:2801
+#: g10/g10.c:2806
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/g10.c:2810
+#: g10/g10.c:2815
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/g10.c:2814
+#: g10/g10.c:2819
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/g10.c:2818
+#: g10/g10.c:2823
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/g10.c:2851
+#: g10/g10.c:2856
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/g10.c:2898
+#: g10/g10.c:2903
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2903
+#: g10/g10.c:2908
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:2908
+#: g10/g10.c:2913
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/g10.c:3004
+#: g10/g10.c:3009
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/g10.c:3015
+#: g10/g10.c:3020
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/g10.c:3026
+#: g10/g10.c:3031
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/g10.c:3033
+#: g10/g10.c:3038
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/g10.c:3035
+#: g10/g10.c:3040
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/g10.c:3045
+#: g10/g10.c:3050
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/g10.c:3058
+#: g10/g10.c:3063
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/g10.c:3060
+#: g10/g10.c:3065
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/g10.c:3063
+#: g10/g10.c:3068
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/g10.c:3081
+#: g10/g10.c:3086
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/g10.c:3094
+#: g10/g10.c:3099
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/g10.c:3109
+#: g10/g10.c:3114
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/g10.c:3111
+#: g10/g10.c:3116
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/g10.c:3114
+#: g10/g10.c:3119
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/g10.c:3134
+#: g10/g10.c:3139
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/g10.c:3143
+#: g10/g10.c:3148
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/g10.c:3168
+#: g10/g10.c:3173
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/g10.c:3176
+#: g10/g10.c:3181
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/g10.c:3180
+#: g10/g10.c:3185
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/g10.c:3201
+#: g10/g10.c:3206
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/g10.c:3272
+#: g10/g10.c:3277
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/g10.c:3309
+#: g10/g10.c:3314
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/g10.c:3311
+#: g10/g10.c:3316
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/g10.c:3313
+#: g10/g10.c:3318
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/g10.c:3324
+#: g10/g10.c:3329
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/g10.c:3334
+#: g10/g10.c:3339
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/g10.c:3375
+#: g10/g10.c:3380
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/g10.c:3383
+#: g10/g10.c:3388
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/g10.c:3470
+#: g10/g10.c:3475
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/g10.c:3593
+#: g10/g10.c:3598
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/g10.c:3597
+#: g10/g10.c:3602
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/g10.c:3887
+#: g10/g10.c:3892
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/g10.c:3895
+#: g10/g10.c:3900
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/g10.c:3900
-#, fuzzy
+#: g10/g10.c:3905
 msgid "a notation name must not contain more than one '@' character\n"
-msgstr "使用者標記名稱一定要含有 '@' 字符\n"
+msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 
-#: g10/g10.c:3911
+#: g10/g10.c:3916
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/g10.c:3945
+#: g10/g10.c:3950
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/g10.c:3947
+#: g10/g10.c:3952
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/g10.c:3980
+#: g10/g10.c:3985
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -1629,26 +1628,26 @@ msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 快取裡有太多項目 - 已禁用\n"
 
-#: g10/getkey.c:187 g10/getkey.c:2757
+#: g10/getkey.c:187 g10/getkey.c:2759
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:1684
+#: g10/getkey.c:1683
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2235
+#: g10/getkey.c:2237
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2466
+#: g10/getkey.c:2468
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2513
+#: g10/getkey.c:2515
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
@@ -2000,323 +1999,353 @@ msgstr "沒有可用的說明"
 msgid "No help available for `%s'"
 msgstr "`%s' 沒有可用的說明"
 
-#: g10/import.c:248
+#: g10/import.c:254
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "正在跳過 %d 型態的區塊\n"
 
-#: g10/import.c:257
+#: g10/import.c:263
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "已有 %lu 把金鑰被處理了\n"
 
-#: g10/import.c:274
+#: g10/import.c:280
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "總共被處理的數量: %lu\n"
 
-#: g10/import.c:276
+#: g10/import.c:282
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "        已跳過的新金鑰: %lu\n"
 
-#: g10/import.c:279
+#: g10/import.c:285
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:281
+#: g10/import.c:287
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:287
+#: g10/import.c:293
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
 
-#: g10/import.c:289
+#: g10/import.c:295
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "         新的使用者 ID: %lu\n"
 
-#: g10/import.c:291
+#: g10/import.c:297
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "              新的子鑰: %lu\n"
 
-#: g10/import.c:293
+#: g10/import.c:299
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              新的簽章: %lu\n"
 
-#: g10/import.c:295
+#: g10/import.c:301
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:297
+#: g10/import.c:303
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          被讀取的私鑰: %lu\n"
 
-#: g10/import.c:299
+#: g10/import.c:305
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:301
+#: g10/import.c:307
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:303
+#: g10/import.c:309
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
 
-#: g10/import.c:544
+#: g10/import.c:311
+#, fuzzy, c-format
+msgid "    signatures cleaned: %lu\n"
+msgstr "目前建立的簽章: %lu\n"
+
+#: g10/import.c:313
+#, fuzzy, c-format
+msgid "      user IDs cleaned: %lu\n"
+msgstr "          被讀取的私鑰: %lu\n"
+
+#: g10/import.c:554
 #, c-format
 msgid "WARNING: key %s contains preferences for unavailable\n"
 msgstr "警告: 金鑰 %s 含有不可用的偏好設定\n"
 
-#: g10/import.c:546
+#: g10/import.c:556
 msgid "algorithms on these user IDs:\n"
 msgstr "這些使用者 ID 上的演算法:\n"
 
-#: g10/import.c:583
+#: g10/import.c:593
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:595
+#: g10/import.c:605
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:607
+#: g10/import.c:617
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:620
+#: g10/import.c:630
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議妳更新妳的偏好設定, 並\n"
 
-#: g10/import.c:622
+#: g10/import.c:632
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "重新散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:646
+#: g10/import.c:656
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "妳可以像這樣更新妳的偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:694 g10/import.c:1048
+#: g10/import.c:718 g10/import.c:1104
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:714
+#: g10/import.c:748
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:729
+#: g10/import.c:763
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 非自我簽署的使用者 ID \"%s\" 已被接受\n"
 
-#: g10/import.c:735
+#: g10/import.c:769
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:737
+#: g10/import.c:771
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能是由於遺失自我簽章所導致的後果\n"
 
-#: g10/import.c:747 g10/import.c:1169
+#: g10/import.c:781 g10/import.c:1225
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:753
+#: g10/import.c:787
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:762
+#: g10/import.c:796
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫的鑰匙圈: %s\n"
 
-#: g10/import.c:767 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
+#: g10/import.c:801 g10/openfile.c:265 g10/sign.c:804 g10/sign.c:1069
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在寫到 `%s'\n"
 
-#: g10/import.c:773 g10/import.c:863 g10/import.c:1088 g10/import.c:1230
-#: g10/import.c:2315 g10/import.c:2337
+#: g10/import.c:807 g10/import.c:905 g10/import.c:1144 g10/import.c:1286
+#: g10/import.c:2347 g10/import.c:2369
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫到鑰匙圈 `%s' 時發生錯誤: %s\n"
 
-#: g10/import.c:792
+#: g10/import.c:826
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已被匯入\n"
 
-#: g10/import.c:816
+#: g10/import.c:850
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:833 g10/import.c:1187
+#: g10/import.c:867 g10/import.c:1243
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定位原始的金鑰區塊: %s\n"
 
-#: g10/import.c:841 g10/import.c:1194
+#: g10/import.c:875 g10/import.c:1250
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:873
+#: g10/import.c:915
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:876
+#: g10/import.c:918
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:879
+#: g10/import.c:921
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的簽章\n"
 
-#: g10/import.c:882
+#: g10/import.c:924
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
 
-#: g10/import.c:885
+#: g10/import.c:927
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的子鑰\n"
 
-#: g10/import.c:888
+#: g10/import.c:930
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的子鑰\n"
 
-#: g10/import.c:909
+#: g10/import.c:933
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signature cleaned\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
+
+#: g10/import.c:936
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d signatures cleaned\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的簽章\n"
+
+#: g10/import.c:939
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user ID cleaned\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
+
+#: g10/import.c:942
+#, fuzzy, c-format
+msgid "key %s: \"%s\" %d user IDs cleaned\n"
+msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
+
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 沒有被改變\n"
 
-#: g10/import.c:1054
+#: g10/import.c:1110
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的編密法 %d - 已跳過\n"
 
-#: g10/import.c:1065
+#: g10/import.c:1121
 msgid "importing secret keys not allowed\n"
 msgstr "未被允許匯入私鑰\n"
 
-#: g10/import.c:1082 g10/import.c:2330
+#: g10/import.c:1138 g10/import.c:2362
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1093
+#: g10/import.c:1149
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰被匯入了\n"
 
-#: g10/import.c:1122
+#: g10/import.c:1178
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已經在私鑰鑰匙圈中了\n"
 
-#: g10/import.c:1132
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1162
+#: g10/import.c:1218
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1205
+#: g10/import.c:1261
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1237
+#: g10/import.c:1293
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已被匯入\n"
 
-#: g10/import.c:1302
+#: g10/import.c:1358
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1317
+#: g10/import.c:1373
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 使用了未被支援的公鑰演算法\n"
 
-#: g10/import.c:1319
+#: g10/import.c:1375
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 有無效的自我簽章\n"
 
-#: g10/import.c:1337
+#: g10/import.c:1393
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有子鑰可供附帶\n"
 
-#: g10/import.c:1348 g10/import.c:1398
+#: g10/import.c:1404 g10/import.c:1454
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未被支援的公鑰演算法\n"
 
-#: g10/import.c:1350
+#: g10/import.c:1406
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1365
+#: g10/import.c:1421
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已被移除\n"
 
-#: g10/import.c:1387
+#: g10/import.c:1443
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1400
+#: g10/import.c:1456
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1471
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1457
+#: g10/import.c:1513
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1478
+#: g10/import.c:1534
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -2325,70 +2354,65 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1505
+#: g10/import.c:1561
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 %02X) - 已跳過\n"
 
-#: g10/import.c:1515
+#: g10/import.c:1571
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1532
+#: g10/import.c:1588
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1546
+#: g10/import.c:1602
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1554
+#: g10/import.c:1610
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1575
-#, c-format
-msgid "key %s: expired signature from key %s - skipped\n"
-msgstr "金鑰 %s: 來自金鑰 %s 的簽章過期了 - 已跳過\n"
-
-#: g10/import.c:1678
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1740
+#: g10/import.c:1772
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1754
+#: g10/import.c:1786
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1813
+#: g10/import.c:1845
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1847
+#: g10/import.c:1879
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2236
+#: g10/import.c:2268
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 某份金鑰的序號 (S/N) 與卡片的序號並不吻合\n"
 
-#: g10/import.c:2244
+#: g10/import.c:2276
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2246
+#: g10/import.c:2278
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 次鑰在線上且已存放於卡片上了\n"
 
@@ -2403,60 +2427,60 @@ msgid "keyring `%s' created\n"
 msgstr "鑰匙圈 `%s' 已建立\n"
 
 #: g10/keydb.c:316 g10/keydb.c:319
-#, fuzzy, c-format
+#, c-format
 msgid "keyblock resource `%s': %s\n"
-msgstr "建立 `%s' 時發生錯誤: %s\n"
+msgstr "金鑰區塊資源 `%s': %s\n"
 
 #: g10/keydb.c:698
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
 
-#: g10/keyedit.c:262
+#: g10/keyedit.c:261
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:263
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:341 g10/keylist.c:406
+#: g10/keyedit.c:340 g10/keylist.c:406
 msgid "1 bad signature\n"
 msgstr "1 個損壞的簽章\n"
 
-#: g10/keyedit.c:343 g10/keylist.c:408
+#: g10/keyedit.c:342 g10/keylist.c:408
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 個損壞的簽章\n"
 
-#: g10/keyedit.c:345 g10/keylist.c:410
+#: g10/keyedit.c:344 g10/keylist.c:410
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:347 g10/keylist.c:412
+#: g10/keyedit.c:346 g10/keylist.c:412
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:349 g10/keylist.c:414
+#: g10/keyedit.c:348 g10/keylist.c:414
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因為某個錯誤而未被檢查\n"
 
-#: g10/keyedit.c:351 g10/keylist.c:416
+#: g10/keyedit.c:350 g10/keylist.c:416
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因為某些錯誤而未被檢查\n"
 
-#: g10/keyedit.c:353
+#: g10/keyedit.c:352
 msgid "1 user ID without valid self-signature detected\n"
 msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:355
+#: g10/keyedit.c:354
 #, c-format
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:411 g10/pkclist.c:263
+#: g10/keyedit.c:410 g10/pkclist.c:263
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -2466,17 +2490,17 @@ msgstr ""
 "請判斷妳有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:415 g10/pkclist.c:275
+#: g10/keyedit.c:414 g10/pkclist.c:275
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:416 g10/pkclist.c:277
+#: g10/keyedit.c:415 g10/pkclist.c:277
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:435
+#: g10/keyedit.c:434
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -2486,46 +2510,45 @@ msgstr ""
 "深度大於 1 的話就表示妳信任這把正被簽署的金鑰,\n"
 "同時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:451
+#: g10/keyedit.c:450
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:595
+#: g10/keyedit.c:594
 #, c-format
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已經被撤銷了."
 
-#: g10/keyedit.c:604 g10/keyedit.c:632 g10/keyedit.c:659 g10/keyedit.c:827
-#: g10/keyedit.c:890 g10/keyedit.c:1729
+#: g10/keyedit.c:603 g10/keyedit.c:631 g10/keyedit.c:658 g10/keyedit.c:826
+#: g10/keyedit.c:889 g10/keyedit.c:1729
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "妳仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:618 g10/keyedit.c:646 g10/keyedit.c:673 g10/keyedit.c:833
+#: g10/keyedit.c:617 g10/keyedit.c:645 g10/keyedit.c:672 g10/keyedit.c:832
 #: g10/keyedit.c:1735
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:623
+#: g10/keyedit.c:622
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已經過期了."
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:650
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:679
-#, fuzzy, c-format
+#: g10/keyedit.c:678
+#, c-format
 msgid "User ID \"%s\" is signable.  "
-msgstr "使用者 ID \"%s\" 未經自我簽署."
+msgstr "使用者 ID \"%s\" 可被簽署."
 
-#: g10/keyedit.c:681
-#, fuzzy
+#: g10/keyedit.c:680
 msgid "Sign it? (y/N) "
-msgstr "真的要簽署嗎? (y/N)"
+msgstr "是否要簽署? (y/N) "
 
-#: g10/keyedit.c:703
+#: g10/keyedit.c:702
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -2534,11 +2557,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:712
+#: g10/keyedit.c:711
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr "妳是否想要將它升級成 OpenPGP 自我簽章? (y/N) "
 
-#: g10/keyedit.c:726
+#: g10/keyedit.c:725
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2547,11 +2570,11 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "已經過期了.\n"
 
-#: g10/keyedit.c:730
+#: g10/keyedit.c:729
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr "妳想要發佈一份新的簽章來取代已過期的那一個嗎? (y/N) "
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:750
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -2560,53 +2583,53 @@ msgstr ""
 "妳目前在 \"%s\" 的簽章\n"
 "是一份本地簽章.\n"
 
-#: g10/keyedit.c:755
+#: g10/keyedit.c:754
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "妳是否想要把他升級成可以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:776
+#: g10/keyedit.c:775
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本地簽署了\n"
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:778
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:784
+#: g10/keyedit.c:783
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "妳仍然想要再次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:805
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有東西可以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:820
 msgid "This key has expired!"
 msgstr "這把金鑰已經過期了!"
 
-#: g10/keyedit.c:841
+#: g10/keyedit.c:840
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s 過期.\n"
 
-#: g10/keyedit.c:845
+#: g10/keyedit.c:844
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "妳想要讓妳的簽章也在同一個時候過期嗎? (Y/n) "
 
-#: g10/keyedit.c:883
+#: g10/keyedit.c:882
 msgid ""
 "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
 "mode.\n"
 msgstr "妳不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
-#: g10/keyedit.c:885
+#: g10/keyedit.c:884
 msgid "This would make the key unusable in PGP 2.x.\n"
 msgstr "這會讓這把金鑰在 PGP 2.x 模式下不可使用.\n"
 
-#: g10/keyedit.c:910
+#: g10/keyedit.c:909
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -2615,31 +2638,31 @@ msgstr ""
 "妳有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
 "如果妳不知道這個問題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:915
+#: g10/keyedit.c:914
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我不作答.%s\n"
 
-#: g10/keyedit.c:917
+#: g10/keyedit.c:916
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查過.%s\n"
 
-#: g10/keyedit.c:919
+#: g10/keyedit.c:918
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨意檢查過了.%s\n"
 
-#: g10/keyedit.c:921
+#: g10/keyedit.c:920
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我非常小心地檢查過了.%s\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:926
 msgid "Your selection? (enter `?' for more information): "
 msgstr "妳的選擇是? (輸入 `?' 以取得更多資訊): "
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:950
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -2648,74 +2671,74 @@ msgstr ""
 "妳真的確定要用妳的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:957
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:964
+#: g10/keyedit.c:963
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章不會被標記為不可匯出.\n"
 
-#: g10/keyedit.c:972
+#: g10/keyedit.c:971
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章不會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:982
+#: g10/keyedit.c:981
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記成不可匯出.\n"
 
-#: g10/keyedit.c:989
+#: g10/keyedit.c:988
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記成不可撤銷.\n"
 
-#: g10/keyedit.c:996
+#: g10/keyedit.c:995
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查過這把金鑰.\n"
 
-#: g10/keyedit.c:1001
+#: g10/keyedit.c:1000
 msgid "I have checked this key casually.\n"
 msgstr "我隨意檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1006
+#: g10/keyedit.c:1005
 msgid "I have checked this key very carefully.\n"
 msgstr "我非常小心地檢查過這把金鑰了.\n"
 
-#: g10/keyedit.c:1016
+#: g10/keyedit.c:1015
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1061 g10/keyedit.c:4385 g10/keyedit.c:4476 g10/keyedit.c:4540
-#: g10/keyedit.c:4601 g10/sign.c:370
+#: g10/keyedit.c:1060 g10/keyedit.c:4359 g10/keyedit.c:4450 g10/keyedit.c:4514
+#: g10/keyedit.c:4575 g10/sign.c:370
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗了: %s\n"
 
-#: g10/keyedit.c:1126
+#: g10/keyedit.c:1125
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇含有卡上 (on-card) 金鑰項目 - 沒有可變更的密語.\n"
 
-#: g10/keyedit.c:1137 g10/keygen.c:3065
+#: g10/keyedit.c:1136 g10/keygen.c:3065
 msgid "This key is not protected.\n"
 msgstr "這把金鑰沒有被保護.\n"
 
-#: g10/keyedit.c:1141 g10/keygen.c:3053
+#: g10/keyedit.c:1140 g10/keygen.c:3053
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分沒辦法取用.\n"
 
-#: g10/keyedit.c:1145 g10/keygen.c:3068
+#: g10/keyedit.c:1144 g10/keygen.c:3068
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上 (on-card).\n"
 
-#: g10/keyedit.c:1149 g10/keygen.c:3072
+#: g10/keyedit.c:1148 g10/keygen.c:3072
 msgid "Key is protected.\n"
 msgstr "金鑰被保護了.\n"
 
-#: g10/keyedit.c:1173
+#: g10/keyedit.c:1172
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "無法編輯這把金鑰: %s\n"
 
-#: g10/keyedit.c:1179
+#: g10/keyedit.c:1178
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -2723,11 +2746,11 @@ msgstr ""
 "輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1188 g10/keygen.c:1828
+#: g10/keyedit.c:1187 g10/keygen.c:1828
 msgid "passphrase not correctly repeated; try again"
 msgstr "密語再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/keyedit.c:1193
+#: g10/keyedit.c:1192
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -2735,154 +2758,159 @@ msgstr ""
 "妳不想要用密語 - 這大概是個 *糟* 點子!\n"
 "\n"
 
-#: g10/keyedit.c:1196
+#: g10/keyedit.c:1195
 msgid "Do you really want to do this? (y/N) "
 msgstr "妳真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1267
+#: g10/keyedit.c:1266
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1352
+#: g10/keyedit.c:1351
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1355
+#: g10/keyedit.c:1354
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1356
+#: g10/keyedit.c:1355
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1358
+#: g10/keyedit.c:1357
 msgid "select user ID N"
 msgstr "使用者 ID 選了 N"
 
-#: g10/keyedit.c:1359
+#: g10/keyedit.c:1358
 msgid "select subkey N"
 msgstr "選擇次鑰 N"
 
-#: g10/keyedit.c:1360
+#: g10/keyedit.c:1359
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1363
+#: g10/keyedit.c:1362
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下有關的註解]"
 
-#: g10/keyedit.c:1368
+#: g10/keyedit.c:1367
 msgid "sign selected user IDs locally"
 msgstr "僅在本地簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1370
+#: g10/keyedit.c:1369
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1372
+#: g10/keyedit.c:1371
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1376
+#: g10/keyedit.c:1375
 msgid "add a user ID"
 msgstr "增加一個使用者 ID"
 
-#: g10/keyedit.c:1378
+#: g10/keyedit.c:1377
 msgid "add a photo ID"
 msgstr "增加一個照片 ID"
 
-#: g10/keyedit.c:1380
+#: g10/keyedit.c:1379
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1384
 msgid "add a subkey"
 msgstr "增加一把次鑰"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1388
 msgid "add a key to a smartcard"
 msgstr "加入某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1391
+#: g10/keyedit.c:1390
 msgid "move a key to a smartcard"
 msgstr "移動某把金鑰至智慧卡"
 
-#: g10/keyedit.c:1393
+#: g10/keyedit.c:1392
 msgid "move a backup key to a smartcard"
 msgstr "移動某把備份金鑰至智慧卡"
 
-#: g10/keyedit.c:1397
+#: g10/keyedit.c:1396
 msgid "delete selected subkeys"
 msgstr "刪除所選的次鑰"
 
-#: g10/keyedit.c:1399
+#: g10/keyedit.c:1398
 msgid "add a revocation key"
 msgstr "增加一把撤銷金鑰"
 
-#: g10/keyedit.c:1401
+#: g10/keyedit.c:1400
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1403
+#: g10/keyedit.c:1402
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "從金鑰或所選的次鑰中變更使用期限"
 
-#: g10/keyedit.c:1405
+#: g10/keyedit.c:1404
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1406
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1409
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1411
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1414
+#: g10/keyedit.c:1413
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1419
+#: g10/keyedit.c:1418
 msgid "set preferred keyserver URL for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好金鑰伺服器 URL"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1420
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1424
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1427
+#: g10/keyedit.c:1426
 msgid "revoke signatures on the selected user IDs"
 msgstr "從所選的使用者 ID 上撤銷簽章"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1428
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1434
+#: g10/keyedit.c:1433
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的次鑰"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1434
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1436
+#: g10/keyedit.c:1435
 msgid "disable key"
 msgstr "禁用金鑰"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1436
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
+#: g10/keyedit.c:1438
+#, fuzzy
+msgid "clean unusable parts from key"
+msgstr "不可用的私鑰"
+
 #: g10/keyedit.c:1557
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
@@ -2919,100 +2947,100 @@ msgstr "金鑰已經被撤銷了."
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1749
+#: g10/keyedit.c:1755
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的簽章種類 `%s'\n"
 
-#: g10/keyedit.c:1772
+#: g10/keyedit.c:1778
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1794 g10/keyedit.c:1814 g10/keyedit.c:1980
+#: g10/keyedit.c:1800 g10/keyedit.c:1820 g10/keyedit.c:1986
 msgid "You must select at least one user ID.\n"
 msgstr "妳至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1802
 msgid "You can't delete the last user ID!\n"
 msgstr "妳不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1798
+#: g10/keyedit.c:1804
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1799
+#: g10/keyedit.c:1805
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1849
+#: g10/keyedit.c:1855
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主要金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1867
 msgid "You must select exactly one key.\n"
 msgstr "妳一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1889
+#: g10/keyedit.c:1895
 msgid "Command expects a filename argument\n"
 msgstr "這項指令應該要拿一個檔名當作參數\n"
 
-#: g10/keyedit.c:1903
+#: g10/keyedit.c:1909
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1926
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時發生錯誤: %s\n"
 
-#: g10/keyedit.c:1944
+#: g10/keyedit.c:1950
 msgid "You must select at least one key.\n"
 msgstr "妳至少必須選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1947
+#: g10/keyedit.c:1953
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "妳真的想要刪除被選擇的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1948
+#: g10/keyedit.c:1954
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "妳真的要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1989
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1984
+#: g10/keyedit.c:1990
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2002
+#: g10/keyedit.c:2008
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "妳真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2019
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "妳真的想要撤銷這些被選擇的次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2021
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "妳真的想要撤銷這把次鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2056
+#: g10/keyedit.c:2062
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2088
+#: g10/keyedit.c:2094
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2094
+#: g10/keyedit.c:2100
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好嗎? (y/N) "
 
-#: g10/keyedit.c:2096
+#: g10/keyedit.c:2102
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好嗎? (y/N) "
 
@@ -3128,15 +3156,13 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2831 g10/keyedit.c:3204 g10/keyedit.c:3237
-#: g10/keyserver.c:431 g10/mainproc.c:1594 g10/trustdb.c:1179
-#: g10/trustdb.c:1690 g10/trustdb.c:1751
+#: g10/keyedit.c:2831 g10/keyedit.c:3208 g10/keyserver.c:431
+#: g10/mainproc.c:1594 g10/trustdb.c:1179 g10/trustdb.c:1698
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:3206 g10/keyedit.c:3239
-#: g10/keyserver.c:435 g10/mainproc.c:1596 g10/trustdb.c:532
-#: g10/trustdb.c:1692 g10/trustdb.c:1753
+#: g10/keyedit.c:2833 g10/keyedit.c:3210 g10/keyserver.c:435
+#: g10/mainproc.c:1596 g10/trustdb.c:532 g10/trustdb.c:1700
 msgid "expired"
 msgstr "已過期"
 
@@ -3157,7 +3183,7 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:2963 g10/keyedit.c:3342
+#: g10/keyedit.c:2963 g10/keyedit.c:3316
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "妳確定仍然想要增加嗎? (y/N) "
 
@@ -3196,16 +3222,15 @@ msgid "Nothing deleted.\n"
 msgstr "沒有東西被刪除.\n"
 
 #: g10/keyedit.c:3178
-#, fuzzy, c-format
+#, c-format
 msgid "User ID \"%s\": already clean.\n"
-msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
+msgstr "使用者 ID \"%s\": 已經是乾淨的了.\n"
 
-#: g10/keyedit.c:3208 g10/keyedit.c:3241 g10/trustdb.c:1694 g10/trustdb.c:1755
-#, fuzzy
+#: g10/keyedit.c:3212 g10/trustdb.c:1702
 msgid "invalid"
-msgstr "無效的封裝"
+msgstr "無效"
 
-#: g10/keyedit.c:3337
+#: g10/keyedit.c:3311
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3214,172 +3239,172 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3348
+#: g10/keyedit.c:3322
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "妳不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3368
+#: g10/keyedit.c:3342
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3391
+#: g10/keyedit.c:3365
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3406
+#: g10/keyedit.c:3380
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "妳不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3428
+#: g10/keyedit.c:3402
 msgid "this key has already been designated as a revoker\n"
 msgstr "這把金鑰已被指定為撤銷者了\n"
 
-#: g10/keyedit.c:3447
+#: g10/keyedit.c:3421
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3453
+#: g10/keyedit.c:3427
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "妳確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3514
+#: g10/keyedit.c:3488
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3520
+#: g10/keyedit.c:3494
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把次鑰.\n"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3498
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更某把次鑰的使用期限.\n"
 
-#: g10/keyedit.c:3527
+#: g10/keyedit.c:3501
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3573
+#: g10/keyedit.c:3547
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "妳不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3589
+#: g10/keyedit.c:3563
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3669
+#: g10/keyedit.c:3643
 msgid "Please select exactly one user ID.\n"
 msgstr "請精確地選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:3708 g10/keyedit.c:3818 g10/keyedit.c:3938
+#: g10/keyedit.c:3682 g10/keyedit.c:3792 g10/keyedit.c:3912
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:3879
+#: g10/keyedit.c:3853
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:3959
+#: g10/keyedit.c:3933
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "妳確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:3960
+#: g10/keyedit.c:3934
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "妳確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4022
+#: g10/keyedit.c:3996
 #, c-format
 msgid "No user ID with index %d\n"
-msgstr "索引 %d 沒有使用者 ID\n"
+msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4080
-#, fuzzy, c-format
+#: g10/keyedit.c:4054
+#, c-format
 msgid "No user ID with hash %s\n"
-msgstr "索引 %d 沒有使用者 ID\n"
+msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4107
+#: g10/keyedit.c:4081
 #, c-format
 msgid "No subkey with index %d\n"
-msgstr "索引 %d 沒有次鑰\n"
+msgstr "索引 %d 沒有對應到次鑰\n"
 
-#: g10/keyedit.c:4224
+#: g10/keyedit.c:4198
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4227 g10/keyedit.c:4291 g10/keyedit.c:4334
+#: g10/keyedit.c:4201 g10/keyedit.c:4265 g10/keyedit.c:4308
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被妳的金鑰 %s 於 %s%s%s 簽署了\n"
 
-#: g10/keyedit.c:4229 g10/keyedit.c:4293 g10/keyedit.c:4336
+#: g10/keyedit.c:4203 g10/keyedit.c:4267 g10/keyedit.c:4310
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4233
+#: g10/keyedit.c:4207
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽署已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4237
+#: g10/keyedit.c:4211
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "妳確定妳仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4241
+#: g10/keyedit.c:4215
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4268
+#: g10/keyedit.c:4242
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "妳已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4294
+#: g10/keyedit.c:4268
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4301
+#: g10/keyedit.c:4275
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被妳的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4323
+#: g10/keyedit.c:4297
 msgid "You are about to revoke these signatures:\n"
 msgstr "妳正在撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4343
+#: g10/keyedit.c:4317
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4373
+#: g10/keyedit.c:4347
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:4443
+#: g10/keyedit.c:4417
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
 
-#: g10/keyedit.c:4460
+#: g10/keyedit.c:4434
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 簽章的日期標記為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:4524
+#: g10/keyedit.c:4498
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4586
+#: g10/keyedit.c:4560
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "次鑰 %s 已經被撤銷了.\n"
 
-#: g10/keyedit.c:4681
+#: g10/keyedit.c:4655
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -3579,9 +3604,9 @@ msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
 #: g10/keygen.c:1554
-#, fuzzy, c-format
+#, c-format
 msgid "Signature is valid for? (%s) "
-msgstr "簽章的有效期限是多久? (0) "
+msgstr "簽章的有效期限是多久? (%s) "
 
 #: g10/keygen.c:1572
 msgid "invalid value\n"
@@ -3719,7 +3744,7 @@ msgstr ""
 "妳需要一個密語來保護妳的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:1829 g10/passphrase.c:786
+#: g10/keygen.c:1829 g10/passphrase.c:779
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
@@ -4039,9 +4064,9 @@ msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
 #: g10/keyserver.c:1374
-#, fuzzy, c-format
+#, c-format
 msgid "%s does not support handler version %d\n"
-msgstr "gpgkeys_%s 並不支援經手程式 (handler) 版本 %d\n"
+msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
 #: g10/keyserver.c:1381
 msgid "keyserver timed out\n"
@@ -4334,9 +4359,9 @@ msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
 #: g10/misc.c:694
-#, fuzzy, c-format
+#, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
-msgstr "警告: \"%s\" 選項已不建議使用\n"
+msgstr "警告: \"%s\" 是個被反對使用的指令 - 別再用了\n"
 
 #: g10/misc.c:707
 msgid "Uncompressed"
@@ -4417,34 +4442,34 @@ msgstr "警告: 以可能並不安全的對稱式加密過的階段金鑰\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:305
+#: g10/passphrase.c:298
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: g10/passphrase.c:317
+#: g10/passphrase.c:310
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: g10/passphrase.c:332
+#: g10/passphrase.c:325
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
 msgstr "gpg-agent 協定版本 %d 未被支援\n"
 
-#: g10/passphrase.c:345
+#: g10/passphrase.c:338
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: g10/passphrase.c:358 g10/passphrase.c:634 g10/passphrase.c:721
+#: g10/passphrase.c:351 g10/passphrase.c:627 g10/passphrase.c:714
 msgid "problem with the agent - disabling agent use\n"
 msgstr "代理程式的問題 - 正在停用代理程式\n"
 
-#: g10/passphrase.c:511 g10/passphrase.c:890
+#: g10/passphrase.c:504 g10/passphrase.c:883
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:525
+#: g10/passphrase.c:518
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for user:\n"
@@ -4455,27 +4480,27 @@ msgstr ""
 "\"%.*s\"\n"
 "%u 位元長的 %s 金鑰, ID %s, 建立於 %s%s\n"
 
-#: g10/passphrase.c:550
+#: g10/passphrase.c:543
 msgid "Repeat passphrase\n"
 msgstr "請再輸入一次密語\n"
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:545
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:628
+#: g10/passphrase.c:621
 msgid "cancelled by user\n"
 msgstr "由使用者取消了\n"
 
-#: g10/passphrase.c:781 g10/passphrase.c:944
+#: g10/passphrase.c:774 g10/passphrase.c:937
 msgid "can't query passphrase in batch mode\n"
 msgstr "無法在批次模式中查詢密語\n"
 
-#: g10/passphrase.c:788 g10/passphrase.c:949
+#: g10/passphrase.c:781 g10/passphrase.c:942
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
-#: g10/passphrase.c:871
+#: g10/passphrase.c:864
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -4484,17 +4509,17 @@ msgstr ""
 "妳需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:877
+#: g10/passphrase.c:870
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:886
+#: g10/passphrase.c:879
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
 
-#: g10/passphrase.c:953
+#: g10/passphrase.c:946
 msgid "Repeat passphrase: "
 msgstr "請再輸入一次密語: "
 
@@ -5442,7 +5467,7 @@ msgstr "徹底"
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:583 g10/trustdb.c:2369
+#: g10/trustdb.c:583 g10/trustdb.c:2334
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -5470,32 +5495,32 @@ msgstr "請做一次 --check-trustdb\n"
 msgid "checking the trustdb\n"
 msgstr "正在檢查信任資料庫\n"
 
-#: g10/trustdb.c:2113
+#: g10/trustdb.c:2078
 #, c-format
 msgid "%d keys processed (%d validity counts cleared)\n"
 msgstr "已經處理了 %d 把金鑰 (共計已解決了 %d 份有效性)\n"
 
-#: g10/trustdb.c:2177
+#: g10/trustdb.c:2142
 msgid "no ultimately trusted keys found\n"
 msgstr "沒有找到任何徹底信任的金鑰\n"
 
-#: g10/trustdb.c:2191
+#: g10/trustdb.c:2156
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "徹底信任金鑰 %s 的公鑰沒有被找到\n"
 
-#: g10/trustdb.c:2214
+#: g10/trustdb.c:2179
 #, c-format
 msgid "%d marginal(s) needed, %d complete(s) needed, %s trust model\n"
 msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小需求\n"
 
-#: g10/trustdb.c:2300
+#: g10/trustdb.c:2265
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
-#: g10/trustdb.c:2375
+#: g10/trustdb.c:2340
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "無法更新信任資料庫版本記錄: 寫入失敗: %s\n"
@@ -5805,58 +5830,5 @@ msgstr "尚未啟用安全的記憶體前, 不可能進行操作\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(也許妳選錯程式來做這件事了)\n"
 
-#, fuzzy
-#~ msgid "Unable to clean `%s'\n"
-#~ msgstr "無法執行程式 `%s': %s\n"
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signature removed.\n"
-#~ msgstr "使用者 ID \"%s\" 已經被撤銷了."
-
-#, fuzzy
-#~ msgid "User ID \"%s\": %d signatures removed.\n"
-#~ msgstr "使用者 ID \"%s\" 已經被撤銷了."
-
-#, fuzzy
-#~ msgid "User ID \"%s\" removed: %s\n"
-#~ msgstr "使用者 ID \"%s\" 已經被撤銷了."
-
-#, fuzzy
-#~ msgid "No user IDs are removable.\n"
-#~ msgstr "使用者 ID \"%s\" 已經被撤銷了\n"
-
-#~ msgid "error getting serial number: %s\n"
-#~ msgstr "取得序號時出錯: %s\n"
-
-#~ msgid "Hint: Select the user IDs to sign\n"
-#~ msgstr "提示: 選擇要簽署的使用者 ID\n"
-
-#~ msgid "length of RSA modulus is not %d\n"
-#~ msgstr "RSA 系數的長度並非 %d\n"
-
-#~ msgid "length of an RSA prime is not %d\n"
-#~ msgstr "RSA 質數的長度並非 %d\n"
-
-#~ msgid "bad passphrase or unknown cipher algorithm (%d)\n"
-#~ msgstr "錯誤的密語或未知的編密演算法 (%d)\n"
-
-#~ msgid "can't set client pid for the agent\n"
-#~ msgstr "無法設定代理程式中的使用者端 pid\n"
-
-#~ msgid "can't get server read FD for the agent\n"
-#~ msgstr "無法取得代理程式所需的伺服器讀取檔案描述\n"
-
-#~ msgid "can't get server write FD for the agent\n"
-#~ msgstr "無法取得代理程式所需的伺服器寫入檔案描述\n"
-
-#~ msgid "communication problem with gpg-agent\n"
-#~ msgstr "gpg-agent 的通訊問題\n"
-
-#~ msgid "passphrase too long\n"
-#~ msgstr "密語太長\n"
-
-#~ msgid "invalid response from agent\n"
-#~ msgstr "代理程式傳回無效的回應\n"
-
-#~ msgid "problem with the agent: agent returns 0x%lx\n"
-#~ msgstr "代理程式的問題: 代理程式傳回 0x%lx\n"
+#~ msgid "key %s: expired signature from key %s - skipped\n"
+#~ msgstr "金鑰 %s: 來自金鑰 %s 的簽章過期了 - 已跳過\n"
author	Werner Koch <[email protected]>	2005-06-21 12:54:56 +0000
committer	Werner Koch <[email protected]>	2005-06-21 12:54:56 +0000
commit	167d957f5df4e2c6d1b521b86e912734b6d065bf (patch)
tree	4b575aeeeba3bc527cea8980bcf0344e1d6b3532
parent	* gpgkeys_hkp.c (append_path, send_key, get_key, search_key, main), (diff)
download	gnupg-167d957f5df4e2c6d1b521b86e912734b6d065bf.tar.gz gnupg-167d957f5df4e2c6d1b521b86e912734b6d065bf.zip