About to release 1.3.92

35 files changed, 6528 insertions, 6255 deletions

diff --git a/ChangeLog b/ChangeLog
index bba76121d..313c6d75b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-28  Werner Koch  <[email protected]>
+
+	Released 1.3.92.
+
 2004-10-26  Werner Koch  <[email protected]>
 
 	* configure.ac: New option --disable-gnupg-iconv, define
diff --git a/NEWS b/NEWS
index 5905f8983..cab3025d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,16 @@
-Noteworthy changes in version 1.3.92
+Noteworthy changes in version 1.3.92 (2004-10-28)
 -------------------------------------------------
     
     * Added Russian man page. Thanks to Pawel I. Shajdo.
 
+    * libiconv is now used to support other character sets other than
+      UTF-8, Latin-1,-2 and KOI8-2.  The W32 version will only work
+      correctly when iconv.dll is installed on the system.  A binary
+      version is available at all GNU mirror sites under libiconv.
+     
+    * gettext for Windows has been simplified.  The MO files are now
+      distributed UTF-8 encoded and gpg translates on the fly.
+
 
 Noteworthy changes in version 1.3.91 (2004-10-15)
 -------------------------------------------------
diff --git a/README b/README
index 0725305b8..2f6a79b05 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 1.3.91
+			    Version 1.3.92
 
 	    Copyright 1998, 1999, 2000, 2001, 2002, 2003,
 		 2004 Free Software Foundation, Inc.
diff --git a/configure.ac b/configure.ac
index b4942555b..af485bfed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.7.9"
 
 # 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.3.92-cvs, [email protected])
+AC_INIT(gnupg, 1.3.92, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 8c5c474dd..f43a6384c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-28  Werner Koch  <[email protected]>
+
+	* apdu.c (open_pcsc_reader): Removed bad free in error handler.
+
 2004-10-27  David Shaw  <[email protected]>
 
 	* card-util.c, delkey.c, keygen.c, plaintext.c, keyedit.c,
diff --git a/g10/apdu.c b/g10/apdu.c
index f4b32d141..c75efd122 100644
--- a/g10/apdu.c
+++ b/g10/apdu.c
@@ -1482,6 +1482,7 @@ open_pcsc_reader (const char *portstr)
     }
   strcpy (reader_table[slot].rdrname, portstr? portstr : list);
   xfree (list);
+  list = NULL;
 
   err = pcsc_connect (reader_table[slot].pcsc.context,
                       reader_table[slot].rdrname,
@@ -1495,11 +1496,11 @@ open_pcsc_reader (const char *portstr)
     {
       log_error ("pcsc_connect failed: %s (0x%lx)\n",
                   pcsc_error_string (err), err);
-      pcsc_release_context (reader_table[slot].pcsc.context);
+  
+    pcsc_release_context (reader_table[slot].pcsc.context);
       xfree (reader_table[slot].rdrname);
       reader_table[slot].rdrname = NULL;
       reader_table[slot].used = 0;
-      xfree (list);
       return -1;
     }      
 
diff --git a/g10/options.skel b/g10/options.skel
index 17dc06001..cf5033bef 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -58,7 +58,8 @@
 # for supported character sets.  This character set is only used for
 # metadata and not for the actual message which does not undergo any
 # translation.  Note that future version of GnuPG will change to UTF-8
-# as default character set.
+# as default character set.  In most cases this option is not required 
+# GnuPG is able to figure out the correct charset and use that.
 
 #charset utf-8
 
diff --git a/po/be.po b/po/be.po
index 62f0087ad..0cdda7db1 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -36,9 +36,10 @@ msgstr ""
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -70,8 +71,9 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
@@ -281,8 +283,9 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -451,7 +454,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr ""
 
@@ -604,11 +607,7 @@ msgstr ""
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr ""
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Загад> "
 
@@ -617,7 +616,17 @@ msgstr "Загад> "
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "несумяшчальныя загады\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "сакрэтны ключ недаступны"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -644,8 +653,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -654,13 +663,14 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
-msgstr ""
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr ""
@@ -670,7 +680,7 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
 #: g10/delkey.c:139
@@ -700,7 +710,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
@@ -744,7 +754,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -813,11 +823,6 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "%s: немагчыма стварыць тэчку: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1111,7 +1116,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
@@ -1119,7 +1124,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr ""
 
@@ -1238,7 +1243,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
@@ -2265,29 +2270,29 @@ msgstr ""
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr ""
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr ""
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
@@ -2336,12 +2341,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr ""
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2504,7 +2509,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2851,436 +2856,436 @@ msgstr ""
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
-msgstr ""
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
+msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr ""
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 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:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3733,107 +3738,107 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr ""
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr ""
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
@@ -3953,11 +3958,6 @@ msgstr "збой падпісаньня: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "грамадскі ключ ня знойдзены"
-
 #: g10/keyserver.c:1578
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4386,7 +4386,7 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+msgid "can't query password in batch mode\n"
 msgstr ""
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4457,23 +4457,23 @@ msgstr ""
 msgid "unable to display photo ID!\n"
 msgstr ""
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr ""
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4538,7 +4538,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr ""
 
@@ -4679,7 +4679,7 @@ msgstr ""
 
 #: g10/pkclist.c:903
 #, c-format
-msgid "unknown default recipient `%s'\n"
+msgid "unknown default recipient \"%s\"\n"
 msgstr ""
 
 #: g10/pkclist.c:948
@@ -4708,15 +4708,15 @@ msgstr ""
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -4754,7 +4754,7 @@ msgid "NOTE: key has been revoked"
 msgstr ""
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -4764,65 +4764,65 @@ msgstr "збой падпісаньня: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr ""
 
-#: g10/revoke.c:375
+#: g10/revoke.c:376
 #, c-format
-msgid "no revocation keys found for `%s'\n"
+msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
-msgstr ""
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
+msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr ""
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr ""
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4833,34 +4833,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr ""
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 msgid "Is this okay? (y/N) "
 msgstr ""
 
@@ -5012,58 +5012,50 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr ""
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "немагчыма адкрыць %s: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, c-format
-msgid "skipped `%s': duplicated\n"
+msgid "skipped \"%s\": duplicated\n"
 msgstr ""
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
-msgstr ""
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr ""
 
-#: g10/skclist.c:179
-#, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
@@ -5683,6 +5675,14 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "%s: немагчыма стварыць тэчку: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "немагчыма адкрыць %s: %s\n"
+
+#, fuzzy
 #~ msgid "expires"
 #~ msgstr "збой падпісаньня: %s\n"
 
diff --git a/po/ca.po b/po/ca.po
index 6219cfbda..19de2bfa8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4rc\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2003-12-05 19:15+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -57,9 +57,10 @@ msgstr "no s'ha trobat cap m�dul d'acumulaci� d'entropia\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir �%s�: %s\n"
@@ -93,8 +94,9 @@ msgstr "no s'ha pogut llegir �%s�: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear �%s�: %s\n"
@@ -324,8 +326,12 @@ msgstr "la clau secreta no est� disponible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+# Dest�s? ivb
+# Desat�s, s�. jm
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
 msgstr "no es pot fet aix� en mode desat�s\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -505,7 +511,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "La selecci� �s inv�lida.\n"
 
@@ -666,13 +672,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-# Dest�s? ivb
-# Desat�s, s�. jm
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "no es pot fet aix� en mode desat�s\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Ordre> "
 
@@ -681,7 +681,17 @@ msgstr "Ordre> "
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "les ordres entren en conflicte\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "s'est� escrivint la clau secreta a �%s�\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no �s v�lida (proveu �help�)\n"
 
@@ -709,8 +719,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Introdu�u el nom d'usuari: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir �%s�\n"
@@ -719,13 +729,14 @@ msgstr "no s'ha pogut obrir �%s�\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau �%s�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "s'ha produ�t un error en llegir el bloc de claus: %s\n"
@@ -737,7 +748,8 @@ msgstr "(a no ser que especifiqueu la clau per la empremta digital)\n"
 # Ah�!  Abans �batch� est� tal qual.  Cal unificar.  ivb
 # Fet. jm
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "no es pot fer aix� en el mode desat�s sense �--yes�\n"
 
 #: g10/delkey.c:139
@@ -769,7 +781,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "utilitzeu l'opci� �--delete-secret-keys� per a eliminar-la primer.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creaci� de la contrasenya: %s\n"
@@ -818,7 +830,7 @@ msgstr ""
 "for�ar el xifrat asim�tric %s (%d) viola les prefer�ncies del "
 "destinatari\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -901,11 +913,6 @@ msgstr "no s'ha pogut executar %s �%s�: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no s'ha pogut executar %s �%s�: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "no s'ha pogut crear �%s�: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1211,7 +1218,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clau p�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Xifratge: "
 
@@ -1219,7 +1226,7 @@ msgstr "Xifratge: "
 msgid "Hash: "
 msgstr "Dispersi�: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compressi�: "
 
@@ -1349,7 +1356,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no �s un joc de car�cters v�lid\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr ""
@@ -2536,29 +2543,29 @@ msgstr "[revocaci�]"
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 signatura err�nia\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signatures err�nies\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatura no comprovada per falta de clau\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatura no comprovada a causa d'un error\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures no comprovades a causa d'errors\n"
@@ -2611,14 +2618,14 @@ msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari �%s� est� revocat."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
@@ -2820,7 +2827,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3184,243 +3191,243 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes �%s�: %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "La clau secreta est� disponible.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer a��.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre �toggle� abans.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "La clau est� revocada."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'�ltim ID d'usuari!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si m�s no, una clau.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de prefer�ncies"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les prefer�ncies? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualitzaci�: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualitzaci� de la clau secreta: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualitzaci�.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
 # Potser %s haja d'anar darrere de �clau�.  ivb
 # �s cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha prefer�ncies en un ID d'usuari d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3429,7 +3436,7 @@ msgstr ""
 "necess�riament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3439,7 +3446,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3448,49 +3455,49 @@ msgstr ""
 "AV�S: Aquesta �s una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les seg�ents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. S�... (s/N/x) jm
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura inv�lida? (s/N/x)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3500,168 +3507,168 @@ msgstr ""
 "pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introdu�u l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AV�S: Aquesta clau ha estat revocada pel propietari!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secund�ria.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "S'est� canviant la data de caducitat per a una clau secund�ria.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 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:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hi ha cap clau secund�ria amb l'�ndex %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: �"
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   signat per %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocaci�? (s/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari �%s� ja est� revocat\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4183,109 +4190,109 @@ msgstr ""
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Pol�tica de signatura cr�tica: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Pol�tica de signatura: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "AV�S: s'hi han trobat dades de notaci� inv�lides\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Notaci� de signatura cr�tica: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Notaci� de signatura: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau prim�ria:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Empremta digital de la subclau:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau prim�ria:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AV�S: hi ha 2 fitxers amb informaci� confidencial.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s �s el que no ha canviat\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s �s el nou\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'est� comprovant l'anell �%s�\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
@@ -4412,11 +4419,6 @@ msgstr "la recepci� des del servidor de claus ha fallat: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no �s un ID v�lid\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "no s'ha trobat la clau �%s�: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4881,7 +4883,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "no es pot demanar la contrasenya en mode desat�s\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4960,23 +4963,23 @@ msgstr "�s aquesta foto correcta (s/N/x)? "
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "No s'ha especificat cap ra�"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "La clau ha estat substitu�da"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "La clau ha estat compromesa"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "La clau ja no s'usa"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "L'ID d'usuari ja no �s v�lid"
 
@@ -5047,7 +5050,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "La vostra decisi�? "
 
@@ -5205,8 +5208,8 @@ msgid "skipped: public key already set\n"
 msgstr "es descarta: la clau p�blica ja est� establida\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "el destinatari predeterminat �s desconegut �%s�\n"
 
 #: g10/pkclist.c:948
@@ -5237,15 +5240,15 @@ msgstr "Signatura separada.\n"
 msgid "Please enter name of data file: "
 msgstr "Introdu�u el nom del fitxer de dades: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "s'est� llegint d'stdin...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
@@ -5286,7 +5289,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "ha fallat build_packet: %s\n"
@@ -5296,65 +5299,65 @@ msgstr "ha fallat build_packet: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "A ser revocada per:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aquesta �s una clau de revocaci� sensible)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocaci� per a aquesta clau? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "s'ha for�at l'eixida d'armadura ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "ha fallat make_keysig_packet: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "S'ha creat el certificat de revocaci�.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "no s'han ttrobat claus de revocaci� per a �%s�\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau secreta �%s�: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no hi ha cap clau p�blica corresponent: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "la clau p�blica no coincideix amb la clau secreta!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Voleu crear un certificat de revocaci� per a aquesta clau? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "l'algorisme de protecci� �s desconegut\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Aquesta clau no est� protegida!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5374,34 +5377,34 @@ msgstr ""
 "les\n"
 "disponibles a altres!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Seleccioneu la ra� de la revocaci�:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Cancel�la"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Segurament voleu seleccionar %d ac�)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Introdu�u una descripci� opcional; finalitzeu amb una l�nia en blanc:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Ra� de la revocaci�: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(No es va donar una descripci�)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�s a�� correcte? "
@@ -5587,12 +5590,12 @@ msgstr ""
 "nom�s podeu fer signatures separades amb claus d'estil PGP 2.x mentre "
 "esteu en mode --pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "s'est� escrivint en �%s�\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5600,50 +5603,43 @@ msgstr ""
 "for�ar l'algoritme de digest %s (%d) viola les prefer�ncies del "
 "destinatari\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "signatura:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "no es pot obrir el fitxer: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "nom�s podeu signar en clar amb claus d'estil PGP 2.x en el mode --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "s'utilitzar� xifratge %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la clau no est� marcada com a insegura - no es pot utilitzar amb el GNA "
 "fals!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "es descarta �%s�: duplicat\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "es descarta �%s�: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "es descarta: la clau secreta ja �s present\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "es descarta �%s�: �s una clau ElGamal generada per PGP que no �s "
 "segura per a signatures!\n"
@@ -6310,6 +6306,20 @@ msgstr "l'operaci� no �s possible sense mem�ria segura inicialitzada\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potser heu utilitzat el programa erroni per a aquesta tasca)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "no es pot fet aix� en mode desat�s\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "no s'ha trobat la clau �%s�: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "no s'ha pogut crear �%s�: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "no es pot obrir el fitxer: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "              alias \""
diff --git a/po/cs.po b/po/cs.po
index ee897d586..ea68e88ad 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2003-12-07 16:20+0200\n"
 "Last-Translator: Roman Pavlik <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -34,9 +34,10 @@ msgstr "nebyl detekov�n ��dn� modul pro z�sk�n� entropie\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -68,8 +69,9 @@ msgstr "nemohu ��st `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
@@ -293,8 +295,10 @@ msgstr "tajn� kl�� nen� dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
 msgstr "nelze prov�st v d�vkov�m m�du\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -469,7 +473,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
@@ -628,11 +632,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "nelze prov�st v d�vkov�m m�du\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "P��kaz> "
 
@@ -641,7 +641,17 @@ msgstr "P��kaz> "
 msgid "Admin-only command\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "konfliktn� p��kazy\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "zapisuji tajn� kl�� do `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -668,8 +678,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -678,13 +688,14 @@ msgstr "nelze otev��t `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� `%s' nenalezen: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba p�i �ten� bloku kl��e: %s\n"
@@ -694,7 +705,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dokud neur��te kl�� jeho fingerprintem)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametru \"--yes\" to nemohu v d�vkov�m m�du prov�st\n"
 
 #: g10/delkey.c:139
@@ -726,7 +738,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "abyste ho smazal(a), pou�ijte nejprve parametr \"--delete-secret-key\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
@@ -771,7 +783,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� symetrick� �ifra %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,11 +858,6 @@ msgstr "nelze spustit %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nelze spustit %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "nemohu vytvo�it `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1148,7 +1155,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�ifra: "
 
@@ -1156,7 +1163,7 @@ msgstr "�ifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Komprese: "
 
@@ -1281,7 +1288,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nen� platn� znakov� sada\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nelze pou��t URI serveru kl��� - chyba anal�zy URI\n"
@@ -2423,29 +2430,29 @@ msgstr "[revokace]"
 msgid "[self-signature]"
 msgstr "[podpis kl��e j�m sam�m]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 �patn� podpis\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �patn�ch podpis�\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neov��en, proto�e chyb� kl��\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neov��en, proto�e vznikla chyba\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis� neov��en�ch, proto�e vznikly chyby\n"
@@ -2499,12 +2506,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "U�ivatelsk� ID \"%s\" je revokov�no."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
@@ -2708,7 +2715,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skute�n� podepsat? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3061,240 +3068,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "uk�zat fotografick� ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba p�i �ten� bloku tajn�ho kl��e `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Tajn� kl�� je dostupn�.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Pro proveden� t�to operace je pot�eba tajn� kl��.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, nejd��ve pou�ijte p��kaz \"toggle\" (p�epnout).\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Kl�� revokov�n."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat v�echny id u�ivatele? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�pov�da: Vyberte id u�ivatele k podeps�n�\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybrat alespo� jeden id u�ivatele.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete smazat posledn� id u�ivatele!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybrat alespo� jeden kl��.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybran� kl��e? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento kl��? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit v�echny vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id u�ivatele? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Opravdu chcete revokovat vybran� kl��e? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Opravdu chcete revokovat tento kl��? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavit seznam p�edvoleb"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby pro vybran� id u�ivatele? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat p�edvolby? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�it zm�ny? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez ulo�en�? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Kl�� nebyl zm�n�n, tak�e nen� pot�eba jej aktualizovat.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Tento kl�� m��e b�t revokov�n kl��em %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr "(citliv� informace)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemohu vytvo�it: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokov�n] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnost skon��: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnost skon��: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "d�v�ra: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "d�v�ra: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Tento kl�� byl ozna�en za neplatn� (disabled)"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revokov�n] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U�ivatelsk� ID form�tu PGP 2.x nem� ��dn� p�edvolby\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3302,7 +3309,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3310,7 +3317,7 @@ msgstr ""
 "VAROV�N�: ��dn� u�ivatelsk� ID nebylo ozna�eno jako prim�rn�.  Tento p��kaz\n"
 "              m��e zp�sobit, �e za prim�rn� bude pova�ov�no jin� user ID.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3319,45 +3326,45 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 kl��. P�id�n� fotografick�ho ID m��e v n�kter�ch\n"
 "         verz�ch PGP v�st k odm�tnut� tohoto kl��e.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jist�, �e jej chcete st�le p�idat? (a/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nem�li by jste p�id�vat fotografick� ID k PGP2 kl��i.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento nezn�m� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsan� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smaz�n %d podpis.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smaz�no %d podpis�.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smaz�no.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3366,160 +3373,160 @@ 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:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u�ivatele pov��en�ho revokac�: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROV�N�: Tento kl�� byl revokov�n kl��em s pov��en�m k revokaci!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 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:3050
+#: g10/keyedit.c:3054
 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:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte nejv��e jeden sekund�rn� kl��.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�n�m dobu platnosti sekund�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "M�n�m dobu platnosti prim�rn�ho kl��e.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�v� jeden id u�ivatele .\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jist�(�), �e jej chcete pou��t (a/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u�ivatele s indexem %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rn� kl�� s indexem %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u�ivatele: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podeps�no %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste n�sleduj�c� identifik�tory u�ivatele:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (neexportovateln�)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokov�no %08lX v %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvo�it revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "neexistuje tajn� kl��\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "U�ivatelsk� ID \"%s\" je ji� revokov�no.\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4031,107 +4038,107 @@ msgstr ""
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kritick� podepisovac� politika: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Podepisovac� politika: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROV�N�: nalezen neplatn� form�t z�pisu data\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kritick� podepisovac� notace: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Podepisovac� notace: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "soubor kl��� (keyring)"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [platnost skon��: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podkl��e:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Prim�rn� fingerprint kl��e:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkl��e:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint kl��e ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontroluji soubor kl��� (keyring) `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� zkontrolov�n (%lu podpis�)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
@@ -4254,11 +4261,6 @@ msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "kl�� `%s' nenalezen: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4695,7 +4697,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentem: agent vrac� 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "v d�vkov�m re�imu se nemohu pt�t na heslo\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4772,23 +4775,23 @@ msgstr "Je tato fotografie spr�vn� (a/N/u)? "
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "D�vod nebyl specifikov�n"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Kl�� je nahrazen"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Kl�� byl zkompromitov�n"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Kl�� se ji� nepou��v�"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u�ivatele ji� neplat�"
 
@@ -4859,7 +4862,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Va�e rozhodnut�? "
 
@@ -5014,8 +5017,8 @@ msgid "skipped: public key already set\n"
 msgstr "p�esko�eno: ve�ejn� kl�� je ji� nastaven\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�m� implicitn� adres�t `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5046,15 +5049,15 @@ msgstr "Podpis odd�len� od dokumentu.\n"
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
@@ -5092,7 +5095,7 @@ msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: kl�� byl revokov�n"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
@@ -5102,65 +5105,65 @@ msgstr "selhalo vytvo�en� paketu (build_packet): %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "kl�� %08lX: chyb� identifik�tor u�ivatele\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Revokov�n:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� kl��)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "na��zen v�stup do form�tu ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "vytvo�en� podepisovac�ho paketu (make_keysig_packet) selhalo: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t vytvo�en.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "pro `%s' nebyl nalezen ��dn� revoka�n� kl��\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� kl�� `%s' nenalezen: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "neexistuje odpov�daj�c� ve�ejn� kl��: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "ve�ejn� kl�� neodpov�d� tajn�mu kl��i!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvo�it pro tento kl�� revoka�n� certifik�t? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "nezn�m� kompresn� algoritmus\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento kl�� nen� chr�n�n�!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5179,33 +5182,33 @@ msgstr ""
 "na Va�em po��ta�i m��e ukl�dat data ur�en� k tisku a zp��stupnist je\n"
 "jin�m u�ivatel�m!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m vyberte d�vod revokace:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Zru�it"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravd�podobn� zda chcete vybrat %d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "M��ete vlo�it dal�� popis. Ukon�ete pr�zdn�m ��dkem:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod revokace: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je d�vod revokace vybr�n spr�vn�? "
@@ -5378,61 +5381,54 @@ msgstr ""
 "v m�du --pgp2 m��ete vytvo�it pouze odd�len� podpis (detach-sign)s kl��i "
 "form�tu PGP-2.x\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "zapisuji do '%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "vy��dan� hashovac� algoritmus %s (%d) nevyhovuje p�edvolb�m p��jemce\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "podepisuji:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "nelze otev��t soubor: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et jen �iteln� podpisy s kl��i form�tu PGP-2.x\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�ito �ifrov�n� %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kl�� nen� ozna�en jako nedostate�n� bezpe�n� - nemohu jej pou��t s pad�lan�m "
 "RNG!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "p�esko�en `%s': duplikov�n\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "p�esko�en `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "p�esko�eno: tajn� kl�� je u� v datab�zi\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "p�esko�en `%s': toto je vygenerovan� PGP kl�� podle algoritmu ElGamal,\n"
 "podpisy vytvo�en� t�mto kl��em nejsou bezpe�n�!\n"
@@ -6063,6 +6059,20 @@ msgstr "prov�st operaci nen� mo�n� bez inicializovan� bezpe�n� pam�ti\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravd�podobn� jste pro tento �kol pou�ili nespr�vn� program)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "nelze prov�st v d�vkov�m m�du\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "kl�� `%s' nenalezen: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "nemohu vytvo�it `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "nelze otev��t soubor: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                alias \""
diff --git a/po/da.po b/po/da.po
index 50654ce8d..7ebbc8236 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -37,9 +37,10 @@ msgstr ""
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -71,8 +72,9 @@ msgstr "kan ikke �bne '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -294,8 +296,9 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+msgid "can't do this in batch mode\n"
 msgstr ""
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -471,7 +474,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
@@ -629,11 +632,7 @@ msgstr "kodeord"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr ""
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr ""
 
@@ -642,7 +641,17 @@ msgstr ""
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "konfliktende kommandoer\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "skriver hemmeligt certifikat til '%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -670,8 +679,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -680,13 +689,14 @@ msgstr "kan ikke �bne `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
 #, fuzzy, c-format
-msgid "key `%s' not found: %s\n"
+msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -696,7 +706,7 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 
 #: g10/delkey.c:139
@@ -726,7 +736,7 @@ msgstr ""
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -770,7 +780,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -839,11 +849,6 @@ msgstr "kan ikke �bne %s: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "kan ikke oprette %s: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1140,7 +1145,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
@@ -1148,7 +1153,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
@@ -1268,7 +1273,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
@@ -2318,29 +2323,29 @@ msgstr ""
 msgid "[self-signature]"
 msgstr "[selv-signatur]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 d�rlig signature\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d d�rlige signaturer\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr ""
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr ""
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr ""
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr ""
@@ -2389,13 +2394,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 #, 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2563,7 +2568,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -2929,462 +2934,462 @@ msgstr ""
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1347
 #, fuzzy, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, 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:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 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:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, 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:3495
+#: g10/keyedit.c:3499
 #, 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:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen sekund�r n�gle med indeks %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 #, 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:3737
+#: g10/keyedit.c:3741
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, 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:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3850,113 +3855,113 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 #, fuzzy
 msgid "Signature policy: "
 msgstr "%s signatur fra: %s\n"
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr ""
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr ""
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "             Fingeraftryk:"
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
@@ -4077,11 +4082,6 @@ msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "%s: bruger ikke fundet: %s\n"
-
 #: g10/keyserver.c:1578
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4514,7 +4514,7 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+msgid "can't query password in batch mode\n"
 msgstr ""
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4588,24 +4588,24 @@ msgstr "Er dette korrekt (j/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 #, fuzzy
 msgid "Key is superseded"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr ""
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4677,7 +4677,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Dit valg? "
 
@@ -4827,8 +4827,8 @@ msgid "skipped: public key already set\n"
 msgstr "%s: udelod: offentlig n�gle er allerede tilstede\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "ukendt standard modtager '%s'\n"
 
 #: g10/pkclist.c:948
@@ -4857,15 +4857,15 @@ msgstr ""
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
@@ -4904,7 +4904,7 @@ msgid "NOTE: key has been revoked"
 msgstr "n�gle %08lX: n�gle er blevet annulleret!\n"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
@@ -4914,68 +4914,68 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/revoke.c:375
+#: g10/revoke.c:376
 #, c-format
-msgid "no revocation keys found for `%s'\n"
+msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:429
+#: g10/revoke.c:432
 #, fuzzy, c-format
-msgid "secret key `%s' not found: %s\n"
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -4986,34 +4986,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Brug denne n�gle alligevel? "
@@ -5168,59 +5168,51 @@ msgstr "%s signatur fra: %s\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "signerer:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "kan ikke �bne %s: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr ""
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
-msgstr ""
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
+msgstr "vis pr�ferencer"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
-msgstr ""
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
+msgstr "%s: udelod: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/skclist.c:179
-#, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
@@ -5844,6 +5836,18 @@ 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' not found: %s\n"
+#~ msgstr "%s: bruger ikke fundet: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "kan ikke oprette %s: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "kan ikke �bne %s: %s\n"
+
+#, fuzzy
 #~ msgid "          \""
 #~ msgstr "              alias \""
 
diff --git a/po/de.po b/po/de.po
index eb90dd768..7d3eb2531 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-10-05 10:11+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -34,9 +34,10 @@ msgstr "Kein Modul zum sammeln von Entropie vorhanden\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
@@ -69,8 +70,9 @@ msgstr "'%s' ist unlesbar: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
@@ -296,8 +298,10 @@ msgstr "Geheimer Schl�ssel ist nicht vorhanden"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -474,7 +478,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ung�ltige Auswahl.\n"
 
@@ -633,11 +637,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Befehl> "
 
@@ -646,7 +646,17 @@ msgstr "Befehl> "
 msgid "Admin-only command\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "Widerspr�chliche Befehle\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -674,8 +684,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
@@ -684,13 +694,14 @@ msgstr "'%s' kann nicht ge�ffnet werden\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Fehler beim Lesen des Schl�sselblocks: %s\n"
@@ -700,7 +711,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(es sei denn, Sie geben den Schl�ssel mittels Fingerprint an)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "Dies kann im Batchmodus ohne \"--yes\" nicht durchgef�hrt werden.\n"
 
 #: g10/delkey.c:139
@@ -734,7 +746,7 @@ msgstr ""
 "Verwenden Sie zun�chst das Kommando \"--delete-secret-key\", um ihn zu "
 "entfernen.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen der Passphrase: %s\n"
@@ -786,7 +798,7 @@ msgstr ""
 "Erzwungene Verwendung des symmetrischen Verschl�sselungsverfahren %s (%d) "
 "verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -865,11 +877,6 @@ msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Ausf�hren von %s \"%s\" nicht m�glich: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "'%s' kann nicht erzeugt werden: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1168,7 +1175,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
@@ -1176,7 +1183,7 @@ msgstr "Verschl�.: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Komprimierung: "
 
@@ -1305,7 +1312,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URI konnte nicht zerlegt werden\n"
@@ -2483,29 +2490,29 @@ msgstr "[Widerruf]"
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 falsche Beglaubigung\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
@@ -2565,12 +2572,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch beglaubigen? (j/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht m�glich.\n"
 
@@ -2775,7 +2782,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Wirklich unterschreiben? (j/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3126,241 +3133,241 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "Foto-ID anzeigen"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fehler beim Lesen des geheimen Schl�sselblocks `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zun�chst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Schl�ssel wurde widerrufen."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: W�hlen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, 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:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "M�chten Sie wirklich alle ausgew�hlten User-IDs widerrufen? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich widerrufen? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "M�chten Sie diesen Schl�ssel wirklich wiederrufen? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "Liste der Voreinstellungen einstellen"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich �ndern? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Dieser Schl�ssel k�nnte widerrufen worden sein von %s Schl�ssel "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " Vertrauen: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr "G�ltigkeit: %s"
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schl�ssel ist abgeschaltet"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schl�ssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3369,7 +3376,7 @@ msgstr ""
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
 # translated by wk
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3377,7 +3384,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als prim�r markiert.  Dieses Kommando kann\n"
 "dazu f�hren, da� eine andere User-ID as prim�r angesehen wird.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3387,45 +3394,45 @@ msgstr ""
 "k�nnte\n"
 "         bei einigen PGP-Versionen zur Zur�ckweisung des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch hinzuf�gen? (j/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie k�nnen einem PGP2-artigen Schl���sel keine Foto-ID hinzuf�gen.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ung�ltige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3435,37 +3442,37 @@ msgstr ""
 "         Widerrufers k�nnte bei einigen PGP-Versionen zur Zur�ckweisung\n"
 "         des Schl�ssels f�hren.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3473,129 +3480,129 @@ msgstr ""
 "M�chten Sie diesen Schl�ssel wirklich als vorgesehenen Widerrufer "
 "deklarieren? (j/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID ausw�hlen.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie es wirklich benutzen? (j/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immmer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diese Unterschrift erzeugen (j/N)"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   widerrufen durch %08lX um %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Unterschrift-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "Kein geheimer Schl�ssel\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4102,107 +4109,107 @@ msgstr ""
 msgid "never     "
 msgstr "niemals   "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Krititische Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Beglaubigungsrichtlinie: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Krititische Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Beglaubigungs-\"Notation\": "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Schl�sselbund"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [verf�llt: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Pr�fen des Schl�sselbundes `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schl�ssel bislang gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schl�ssel gepr�ft (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
@@ -4326,11 +4333,6 @@ msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4769,7 +4771,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Schwierigkeiten mit dem Agenten: Agent antwortet 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "Passphrase kann im Batchmodus nicht abgefragt werden\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4848,23 +4851,23 @@ msgstr "Ist dieses Bild richtig? (j/N) "
 msgid "unable to display photo ID!\n"
 msgstr "Die Photo ID kann nicht angezeigt werden!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Kein Grund angegeben"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Schl�ssel ist �berholt"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Hinweis: Dieser Schl�ssel ist nicht mehr sicher"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Schl�ssel wird nicht mehr benutzt"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "User-ID ist nicht mehr g�ltig"
 
@@ -4935,7 +4938,7 @@ msgid ""
 "\n"
 msgstr "Die minimale Trust-Ebene f�r diesen Schl�ssel betr�gt: %s\n"
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
@@ -5102,8 +5105,8 @@ msgid "skipped: public key already set\n"
 msgstr "�bersprungen: �ffentlicher Schl�ssel bereits gesetzt\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "Unbekannter voreingestellter Empf�nger '%s'\n"
 
 #: g10/pkclist.c:948
@@ -5133,15 +5136,15 @@ msgstr "Abgetrennte Beglaubigungen.\n"
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
@@ -5179,7 +5182,7 @@ msgid "NOTE: key has been revoked"
 msgstr "Hinweis: Schl�ssel wurde widerrufen"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "\"build_packet\" fehlgeschlagen: %s\n"
@@ -5189,66 +5192,66 @@ msgstr "\"build_packet\" fehlgeschlagen: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Schl�ssel soll widerrufen werden von:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dies ist ein \"sensitiver\" Widerrufsschl�ssel)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Ausgabe mit ASCII H�lle erzwungen\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "\"make_keysig_packet\" fehlgeschlagen: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Widerrufzertifikat erzeugt.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "Widerrufsschl�ssel f�r `%s' nicht gefunden\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "Geheimer Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "kein zugeh�riger �ffentlicher Schl�ssel: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "�ffentliche Schl�ssel pa�t nicht zum geheimen Schl�ssel!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Ein Widerrufszertifikat f�r diesen Schl�ssel erzeugen? (j/N) "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "Unbekanntes Schutzverfahren\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
 # translated by wk
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5268,34 +5271,34 @@ msgstr ""
 "Drucksystem kann unter Umst�nden eine Kopie anderen Nutzern zug�nglich\n"
 "machen.\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Grund f�r den Widerruf:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Wahrscheinlich m�chten Sie hier %d ausw�hlen)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Geben Sie eine optionale Beschreibung ein. Beenden mit einer leeren Zeile:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Grund f�r Widerruf: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Keine Beschreibung angegeben)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ist das richtig? "
@@ -5485,63 +5488,56 @@ msgstr ""
 "Im --pgp2-Modus kann nur mit PGP-2.x-artigen Schl�sseln eine abgetrennte "
 "Unterschrift erzeugt werden\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "Erzwingen des Hashverfahrens %s (%d) verletzt die Empf�ngervoreinstellungen\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "Datei kann nicht ge�ffnet werden: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie Klartextunterschriften nur mit PGP-2.x-artigen "
 "Schl�ssel machen\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s Verschl�sselung wird verwendet\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "Schl�ssel ist nicht als unsicher gekennzeichnet - er ist nur mit einem\n"
 "echten Zufallsgenerator verwendbar\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "�bersprungen '%s': doppelt\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "�bersprungen '%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "�bersprungen: geheimer Schl�ssel bereits vorhanden\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "'%s �bersprungen: Dies ist ein durch PGP erzeugter ElGamal-Schl�ssel. Das "
 "ist f�r Signaturen NICHT sicher genug!\n"
@@ -6181,6 +6177,20 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "'%s' kann nicht erzeugt werden: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "Datei kann nicht ge�ffnet werden: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                    alias \""
diff --git a/po/el.po b/po/el.po
index 3c674b81b..7d61d5c29 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -36,9 +36,10 @@ msgstr "��� ����������� ������� �������� ���������\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -72,8 +73,9 @@ msgstr "�������� ��������� ��� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
@@ -297,9 +299,11 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -473,7 +477,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
@@ -632,11 +636,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "������> "
 
@@ -645,7 +645,17 @@ msgstr "������> "
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "������������� �������\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "������� ��� �������� �������� ��� `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -672,8 +682,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -682,13 +692,14 @@ msgstr "�������� ��������� ��� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
@@ -698,7 +709,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(����� ��� ������������� ��� ������ ��� ���������)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ ����� �� \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -730,7 +742,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "��������������� ����� ��� ������� \"--delete-secret-key\" ��� �������� ���.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -780,7 +792,7 @@ msgstr ""
 "� ������������ ����������� ���������� %s (%d) ���������� ���\n"
 "�������� ��� ���������\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -859,11 +871,6 @@ msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�������� ��������� ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "�������� ����������� ��� `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1157,7 +1164,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "���������������: "
 
@@ -1165,7 +1172,7 @@ msgstr "���������������: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "��������: "
 
@@ -1289,7 +1296,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
@@ -2442,29 +2449,29 @@ msgstr "[��������]"
 msgid "[self-signature]"
 msgstr "[����-��������]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 ���� ��������\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ����� ���������\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 �������� ��� ��������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ��������� ��� ���������� ���� ������� ��������\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 �������� ��� ��������� ���� ���� ���������\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ��������� ��� ���������� ���� ���������\n"
@@ -2518,12 +2525,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
@@ -2727,7 +2734,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3078,241 +3085,241 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3320,7 +3327,7 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3328,7 +3335,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3337,45 +3344,45 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3385,38 +3392,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3424,129 +3431,129 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ������� ���������� ������ �� ������ %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, 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"
@@ -4060,107 +4067,107 @@ msgstr ""
 msgid "never     "
 msgstr "����     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "�������������: �������� �� ������ �������� ���������\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "�������� �������� ���������: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "�������� ���������: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "����������"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [�����: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "��������� �������� ��������:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     ��������� �����������:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " ��������� �������� ��������:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      ��������� �����������:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     ��������� �������� ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
@@ -4284,11 +4291,6 @@ msgstr "keyserver ���� �������: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "�� ������ '%s' �� �������: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4724,7 +4726,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "�������� �������� ��� ����� ������ �� ��������� ������\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4801,23 +4804,23 @@ msgstr "����� ���� � ���������� ����� (y/N/q); "
 msgid "unable to display photo ID!\n"
 msgstr "�������� ����������� ��� photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "��� ���� ������� �����"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "�� ������ ���� ����������"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "�� ������ ���� �������"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "�� ������ �� ��������������� �����"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "�� User ID ��� ����� ����� ������"
 
@@ -4888,7 +4891,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "� ������� ���; "
 
@@ -5049,8 +5052,8 @@ msgid "skipped: public key already set\n"
 msgstr "������������: ������� ������ ���� ��� �������\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5079,15 +5082,15 @@ msgstr "���������� ��������.\n"
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
@@ -5125,7 +5128,7 @@ msgid "NOTE: key has been revoked"
 msgstr "��������: �� ������ ���� ���������"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �������: %s\n"
@@ -5135,65 +5138,65 @@ msgstr "build_packet �������: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "���� �������� ���:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(���� ����� ��� ��������� ������ ���������)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "������������ ������ �� ����������� ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �������: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "������������� ��������� �������������.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "�� �������� ������� ��������� ��� �� `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "�� ������� ������ `%s' �� �������: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� �� ������; "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "��������: ���� �� ������ ��� �������������!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5212,33 +5215,33 @@ msgstr ""
 "������� �� ������� ��������� ��� �������� ��� ������ �� ����������� ���\n"
 "�������� ��� �� ��� ����� ��������� �� ������!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "�������"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(������� �� ������ �� ��������� �� %d ���)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�������������� ��� ����������� ��������޷ ����� �� ��� ����� ������:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����� ��� ��������: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(��� ������ ���������)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "����� ���� �������; "
@@ -5417,12 +5420,12 @@ msgstr ""
 "�������� �� ����������-���������� �� ������� ����� PGP 2.x ���� ��\n"
 "--pgp2 ���������\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5430,50 +5433,43 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "��������:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "�������� ��������� ��� �������: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ���������� ������ �� ������� ����� PGP 2.x �� ��������� --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ������������� �� ��������������\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�� ������ ��� ���� ��������� ��� ��������� - ��� ������ �� �������������� �� "
 "������� RNG!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "������������ `%s': ������������\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "������������ `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "������������ `%s': ���� ����� ������������� ��� PGP ������ ElGamal ��� ��� "
 "����� ������� ��� ���������!\n"
@@ -6104,6 +6100,20 @@ msgstr "� ���������� ��� ����� ������ ����� �������������� ������ �����\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(���� ��������������� ����� ��������� ��� ���� ��� �������)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "�������, ��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "�� ������ '%s' �� �������: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "�������� ����������� ��� `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "�������� ��������� ��� �������: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                ������ ��� \""
diff --git a/po/eo.po b/po/eo.po
index 31a70740c..04a02dc53 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -35,9 +35,10 @@ msgstr ""
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -70,8 +71,9 @@ msgstr "ne povas legi '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
@@ -293,9 +295,10 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
-msgid "sorry, can't do this in batch mode\n"
+msgid "can't do this in batch mode\n"
 msgstr "ne povas fari tion en neinteraga re�imo\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -470,7 +473,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
@@ -629,11 +632,7 @@ msgstr "pasf"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "ne povas fari tion en neinteraga re�imo\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Komando> "
 
@@ -642,7 +641,17 @@ msgstr "Komando> "
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "malkongruaj komandoj\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "skribas sekretan �losilon al '%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -670,8 +679,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -680,13 +689,14 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
@@ -696,7 +706,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ne povas fari tion en neinteraga re�imo sen \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -727,7 +738,7 @@ msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "uzu la opcion \"--delete-secret-key\" por forvi�i �in unue.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -771,7 +782,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -842,11 +853,6 @@ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "ne povas krei '%s': %s\n"
-
 #: g10/exec.c:521
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
@@ -1140,7 +1146,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
@@ -1148,7 +1154,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
@@ -1268,7 +1274,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
@@ -2402,29 +2408,29 @@ msgstr "[revoko]"
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 malbona subskribo\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d malbonaj subskriboj\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 subskribo ne kontrolita pro eraro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d subskriboj ne kontrolitaj pro eraroj\n"
@@ -2478,13 +2484,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 #, 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2701,7 +2707,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3058,253 +3064,253 @@ msgstr "monfoto"
 msgid "show photo ID"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, 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:1636
+#: g10/keyedit.c:1640
 #, 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:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3313,46 +3319,46 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -3362,164 +3368,164 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 #, 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:2904
+#: g10/keyedit.c:2908
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 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:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, 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:3495
+#: g10/keyedit.c:3499
 #, 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:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Mankas flanka �losilo kun indekso %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 #, 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:3737
+#: g10/keyedit.c:3741
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4024,113 +4030,113 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Subskribo-gvidlinioj: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "�losilaro"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     �losilo-fingrospuro ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
@@ -4253,11 +4259,6 @@ msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "�losilo '%s' ne trovita: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4691,7 +4692,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4765,23 +4767,23 @@ msgstr "�u tio estas �usta (j/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Nenia kialo specifita"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "�losilo estas anstata�igita."
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "�losilo estas kompromitita"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "�losilo estas ne plu uzata"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Uzantidentigilo ne plu validas"
 
@@ -4854,7 +4856,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Via decido? "
 
@@ -5010,8 +5012,8 @@ msgid "skipped: public key already set\n"
 msgstr "ignorita: publika �losilo jam agordita\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
 #: g10/pkclist.c:948
@@ -5040,15 +5042,15 @@ msgstr "Aparta subskribo.\n"
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
@@ -5087,7 +5089,7 @@ msgid "NOTE: key has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -5097,68 +5099,68 @@ msgstr "aktualigo malsukcesis: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "listigo de �losilblokoj malsukcesis: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/revoke.c:375
+#: g10/revoke.c:376
 #, c-format
-msgid "no revocation keys found for `%s'\n"
+msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:429
+#: g10/revoke.c:432
 #, fuzzy, c-format
-msgid "secret key `%s' not found: %s\n"
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5169,37 +5171,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Donu la uzantidentigilon. Finu per malplena linio: "
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Kialo por revoko: "
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�u tamen uzi �i tiun �losilon? "
@@ -5365,61 +5367,54 @@ msgstr "%s-subskribo de: %s\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "eblas subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "subskribas:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "ne povas malfermi %s: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "eblas klartekste subskribi nur per PGP-2.x-stilaj �losiloj kun --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �ifrado estos aplikata\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "�losilo ne estas markita kiel malsekura - ne povas uzi �in kun falsa "
 "stokastilo!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "ignoris '%s': ripetita\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignoris '%s': �i tio estas PGP-kreita ElGamal-�losilo, kiu ne estas sekura "
 "por subskribado!\n"
@@ -6048,6 +6043,21 @@ 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 "sorry, can't do this in batch mode\n"
+#~ msgstr "ne povas fari tion en neinteraga re�imo\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "�losilo '%s' ne trovita: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "ne povas krei '%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "ne povas malfermi %s: %s\n"
+
+#, fuzzy
 #~ msgid "          \""
 #~ msgstr "            alinome \""
 
diff --git a/po/es.po b/po/es.po
index 1da9b4d54..6c1ff407a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-10-12 19:27+0200\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -39,9 +39,10 @@ msgstr "no se ha detectado m�dulo acumulador de entrop�a\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -79,8 +80,9 @@ msgstr "no se puede leer `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
@@ -306,9 +308,11 @@ msgstr "clave secreta no disponible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -484,7 +488,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
@@ -643,11 +647,7 @@ msgstr "contr"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "imposible hacer esto en modo de proceso por lotes\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Orden> "
 
@@ -656,7 +656,17 @@ msgstr "Orden> "
 msgid "Admin-only command\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "�rdenes incompatibles\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "escribiendo clave privada en `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -684,8 +694,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -694,13 +704,14 @@ msgstr "no se puede abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "clave '%s' no encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "error leyendo bloque de claves: %s\n"
@@ -710,7 +721,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(excepto si especifica la clave dando su huella digital)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposible hacer esto en modo de proceso por lotes sin \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -741,7 +753,7 @@ msgstr "�hay una clave secreta para esta clave p�blica! \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use antes la opci�n \"--delete-secret-key\" para borrarla.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando frase contrase�a: %s\n"
@@ -788,7 +800,7 @@ msgstr ""
 "forzar el cifrado sim�trico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -867,11 +879,6 @@ msgstr "no se puede ejecutar %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "no se puede ejecutar %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "no se puede crear %s: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1174,7 +1181,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifrado: "
 
@@ -1182,7 +1189,7 @@ msgstr "Cifrado: "
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -1301,7 +1308,7 @@ msgstr "no se carga el cifrado de ampliaci�n \"%s\" por permisos inseguros\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URI del servidor de claves\n"
@@ -2443,29 +2450,29 @@ msgstr "[revocaci�n]"
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por errores\n"
@@ -2519,12 +2526,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
@@ -2725,7 +2732,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3078,241 +3085,241 @@ msgstr "verfoto"
 msgid "show photo ID"
 msgstr "mostrar ID fotogr�fico"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los identificadores de usuario? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "�De verdad quiere revocar las claves seleccionadas? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "�De verdad quiere revocar esta clave? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "establece preferencias"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para todos los ID seleccionados? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta clave puede ser revocada por la clave %s"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (confidencial)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no se puede crear %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expira"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3320,7 +3327,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3328,7 +3335,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3337,45 +3344,45 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3384,163 +3391,163 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATENCI�N: �Esta clave ha sido revocada por la persona designada\n"
 "como revocador!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere usarlo? (s/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, 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:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmada por %08lX el %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado los siguientes IDs de usuario:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX el %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4049,107 +4056,107 @@ msgstr ""
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Pol�tica de firmas cr�ticas: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Pol�tica de firmas: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCI�N: encontrados datos de notaci�n inv�lidos\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Notaci�n de firmas cr�ticas: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Notaci�n de firma: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Anillo de claves"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Huella de subclave:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Huella de clave primaria:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "    Huella de clave ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando anillo `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu claves comprobadas (%lu firmas)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves comprobadas (%lu firmas)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
@@ -4272,11 +4279,6 @@ msgstr "recepci�n del servidor de claves fallida: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "'%s' no es un identificador de clave v�lido\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "clave '%s' no encontrada: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4708,7 +4710,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con el agente: el agente devuelve 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4785,23 +4788,23 @@ msgstr "�Es correcta la foto? (s/n) "
 msgid "unable to display photo ID!\n"
 msgstr "�no puedo mostrar ID fotogr�fico!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "No se dio ninguna raz�n"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "La clave ha sido reemplazada."
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "La clave ha sido comprometida"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "La clave ya no est� en uso"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "El identificador de usuario ya no es v�lido"
 
@@ -4872,7 +4875,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Su decisi�n: "
 
@@ -5029,8 +5032,8 @@ msgid "skipped: public key already set\n"
 msgstr "omitida: clave p�blica ya establecida\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "desconocido el destinatario predefinido `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5059,15 +5062,15 @@ msgstr "Firma separada.\n"
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
@@ -5105,7 +5108,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: la clave ha sido revocada"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "construcci�n del paquete fallida: %s\n"
@@ -5115,65 +5118,65 @@ msgstr "construcci�n del paquete fallida: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "clave %08lX: sin identificador de usuario\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Ser� revocado por:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Este es una clave de revocaci�n confidencial)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "se fuerza salida con armadura ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fall�: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Certificado de revocaci�n creado.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "no se encuetran claves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "clave secreta `%s' no encontrada: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "no existe la clave p�blica correspondiente: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "�la clave p�blica y la privada no se corresponden!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desconocido\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta clave no est� protegida!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5192,33 +5195,33 @@ msgstr ""
 "de impresi�n de su m�quina podr�a almacenar los datos y hacerlos accesibles\n"
 "a otras personas!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor elija una raz�n para la revocaci�n:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probablemente quer�a seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduzca una descripci�n opcional; ac�bela con una l�nea vac�a:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Raz�n para la revocaci�n: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(No se di� descripci�n)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�Es correcto? "
@@ -5389,12 +5392,12 @@ msgstr ""
 "s�lo puede hacer firmas separadas con claves tipo PGP 2.x estando enmodo --"
 "pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5402,47 +5405,40 @@ msgstr ""
 "forzar el algoritmo de resumen %s (%d) va en contra de las\n"
 "preferencias del destinatario\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "no puede abrirse el fichero: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s�lo puede firmar en claro con claves PGP 2.x estando en modo --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "se usar� un cifrado %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "clave no marcada como insegura - no puede usarse con el pseudo RNG\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' omitido: duplicado\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "`%s' omitido: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "omitido: clave secreta ya presente\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "`%s' omitida: esta es una clave ElGamal generada por PGP que NO es segura "
 "para las firmas\n"
@@ -6099,6 +6095,20 @@ 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 "sorry, can't do this in batch mode\n"
+#~ msgstr "lo siento, no puede hacerse en modo de proceso por lotes\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "clave '%s' no encontrada: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "no se puede crear %s: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "no puede abrirse el fichero: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                alias \""
diff --git a/po/et.po b/po/et.po
index b3979a0ab..706fbbcc5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -35,9 +35,10 @@ msgstr "entroopia kogumise moodul puudub\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -69,8 +70,9 @@ msgstr "`%s' ei �nnestu lugeda: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
@@ -293,9 +295,11 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "vabandust, seda ei saa pakettmoodis teha\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "seda ei saa teha pakettmoodis\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -469,7 +473,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
@@ -628,11 +632,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "seda ei saa teha pakettmoodis\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "K�sklus> "
 
@@ -641,7 +641,17 @@ msgstr "K�sklus> "
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "vastuolulised k�sud\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "kirjutan salajase v�tme faili `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -668,8 +678,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -678,13 +688,14 @@ msgstr "`%s' ei �nnestu avada\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
@@ -694,7 +705,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kui te just ei m��ra v�tit s�rmej�ljega)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "pakettmoodis ei �nnestu seda teha v�tmeta \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -725,7 +737,7 @@ msgstr "avaliku v�tme \"%s\" jaoks on salajane v�ti!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "selle kustutamiseks kasutage v�tit \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -771,7 +783,7 @@ msgid ""
 msgstr ""
 "s�mmetrilise �ifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -847,11 +859,6 @@ msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "ei �nnestu k�ivitada %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "`%s' ei �nnestu luua: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1145,7 +1152,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�iffer: "
 
@@ -1153,7 +1160,7 @@ msgstr "�iffer: "
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Pakkimine: "
 
@@ -1272,7 +1279,7 @@ msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
@@ -2400,29 +2407,29 @@ msgstr "[t�histamine]"
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 halb allkiri\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d halba allkirja\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allkiri j�i vea t�ttu kontrollimata\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allkirja j�i vigade t�ttu kontrollimata\n"
@@ -2476,12 +2483,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
@@ -2681,7 +2688,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3034,240 +3041,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, 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:1636
+#: g10/keyedit.c:1640
 #, 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:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3275,7 +3282,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3283,7 +3290,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3292,45 +3299,45 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3339,160 +3346,160 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Sekundaarne v�ti numbriga %d puudub\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, 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"
@@ -3993,107 +4000,107 @@ msgstr ""
 msgid "never     "
 msgstr "mitte kunagi"
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kriitiline allkirja poliitika: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Allkirja poliitika: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kriitiline allkirja noteerimine: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "V�tmehoidla"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [aegub: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "    Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Primaarse v�tme s�rmej�lg:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "     Alamv�tme s�rmej�lg:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     V�tme s�rmej�lg ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
@@ -4216,11 +4223,6 @@ msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "v�tit '%s' ei leitud: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4650,7 +4652,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "pakettmoodis ei saa parooli k�sida\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4727,23 +4730,23 @@ msgstr "On see foto �ige (j/E/v)? "
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa n�idata!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "P�hjus puudub"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "V�ti on asendatud"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "V�ti on kompromiteeritud"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "V�ti ei ole enam kasutusel"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Kasutaja ID ei ole enam kehtiv"
 
@@ -4814,7 +4817,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Teie otsus? "
 
@@ -4966,8 +4969,8 @@ msgid "skipped: public key already set\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
 #: g10/pkclist.c:948
@@ -4996,15 +4999,15 @@ msgstr "Eraldiseisev allkiri.\n"
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
@@ -5042,7 +5045,7 @@ msgid "NOTE: key has been revoked"
 msgstr "M�RKUS: v�ti on t�histatud"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet eba�nnestus: %s\n"
@@ -5052,67 +5055,67 @@ msgstr "build_packet eba�nnestus: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "T�histaja:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(See on tundlik t�histamise v�ti)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "V�ljundis sunnitakse kasutama ASCII vormingut.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet eba�nnestus: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "T�histamise sertifikaat on loodud.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 "`%s' jaoks pole t�histamise v�tmeid\n"
 "\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "salajast v�tit `%s' ei leitud: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Loon sellele v�tmele t�histamise sertifikaadi? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "M�RKUS: See v�ti ei ole kaitstud!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5133,33 +5136,33 @@ msgstr ""
 "tr�kis�steem\n"
 "v�ib salvestada need andmed ja teha teistele k�ttesaadavaks! \n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(T�en�oliselt soovite siin valida %d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Sisestage mittekohustuslik kirjeldus. L�petage t�hja reaga:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "T�histamise p�hjus: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "On see h�sti? "
@@ -5322,61 +5325,54 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab eraldi-allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "allkirjastan:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "faili ei �nnestu avada: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x stiilis v�tmetega saab avateksti allkirjastada ainult --pgp2 moodis\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "kasutatakse %s kr�pteerimist\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "v�ti ei ole m�rgitud ebaturvaliseks - sellega ei saa v�lts RNGd kasutada!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' j�tsin vahele: duplikaat\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "`%s' j�tsin vahele: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "j�tsin `%s' vahele: see on PGP genereeritud ElGamal v�ti,\n"
 "mis ei ole allkirjades kasutamiseks turvaline!\n"
@@ -6004,6 +6000,20 @@ msgstr "initsialiseerimata turvalise m�luta ei ole operatsioon v�imalik\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(te kasutasite vahest selle t�� jaoks valet programmi)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "vabandust, seda ei saa pakettmoodis teha\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "v�tit '%s' ei leitud: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "`%s' ei �nnestu luua: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "faili ei �nnestu avada: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                 ka \""
diff --git a/po/fi.po b/po/fi.po
index a26e861de..597589d5d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -51,9 +51,10 @@ msgstr "entropian keräysmoduulia ei havaittu\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -86,8 +87,9 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
@@ -313,9 +315,11 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "valitan, tätä ei voi tehdä eräajossa\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "tätä ei voi tehdä eräajossa\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -489,7 +493,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
@@ -648,11 +652,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "tätä ei voi tehdä eräajossa\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Komento> "
 
@@ -661,7 +661,17 @@ msgstr "Komento> "
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "ristiriitainen komento\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -688,8 +698,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -698,13 +708,14 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
@@ -714,7 +725,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(ellet määritä avainta sormenjäljen perusteella)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "ei onnistu eräajossa ilman \"--yes\"-valitsinta\n"
 
 #: g10/delkey.c:139
@@ -745,7 +757,7 @@ msgstr "julkiselle avaimelle \"%s\" löytyy vastaava salainen avain!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "käytä valitsinta \"--delete-secret-keys\" poistaaksesi se ensin.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -790,7 +802,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -865,11 +877,6 @@ msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "komentoa %s \"%s\" ei voi suorittaa: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1166,7 +1173,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Salaus: "
 
@@ -1174,7 +1181,7 @@ msgstr "Salaus: "
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Pakkaus: "
 
@@ -1293,7 +1300,7 @@ msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
@@ -2435,29 +2442,29 @@ msgstr "[mitätöinti]"
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 väärä allekirjoitus\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d väärää allekirjoitusta\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d allekirjoitusta jätetty tarkistamatta virheiden vuoksi\n"
@@ -2512,12 +2519,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
@@ -2719,7 +2726,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3072,240 +3079,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 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:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3313,7 +3320,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3321,7 +3328,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3330,45 +3337,45 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3378,162 +3385,162 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 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:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Indeksillä %d ei löydy toissijaista avainta\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, 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:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, 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:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4041,107 +4048,107 @@ msgstr ""
 msgid "never     "
 msgstr "ei koskaan"
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kriittinen allekirjoituskäytäntö: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Allekirjoituskäytäntö: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kriittinen allekirjoitusnotaatio: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [vanhenee: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
@@ -4266,11 +4273,6 @@ msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "avainta \"%s\" ei löydy: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4707,7 +4709,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "salasanan kysyminen ei onnistu eräajossa\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4784,23 +4787,23 @@ msgstr "Onko tämä oikein (k/E/l)? "
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Avain on uusittu"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Avain on murrettu"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Avain ei ole enää käytössä"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Käyttäjätunnus ei ole enää käytössä"
 
@@ -4871,7 +4874,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Valintasi? "
 
@@ -5032,8 +5035,8 @@ msgid "skipped: public key already set\n"
 msgstr "ohitettu: julkinen avain on jo asetettu\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
 #: g10/pkclist.c:948
@@ -5063,15 +5066,15 @@ msgstr "Erillinen allekirjoitus.\n"
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
@@ -5109,7 +5112,7 @@ msgid "NOTE: key has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet epäonnistui: %s\n"
@@ -5119,65 +5122,65 @@ msgstr "build_packet epäonnistui: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Mitätöinnin tekee:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Tämä on arkaluonteinen mitätöintiavain)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-koodattu tuloste määritetty.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet epäonnistui: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "mitätöintiavainta ei löydy avaimelle \"%s\"\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "salaista avainta \"%s\" ei löydy: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "HUOM: Tätä avainta ei ole suojattu!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5197,33 +5200,33 @@ msgstr ""
 "tulostusjärjestelmä saattaa tallentaa datan ja saattaa sen muiden "
 "saataville!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Peru"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Todennäköisesti haluat valita %d tässä)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Syötä vapaaehtoinen kuvaus; lopeta tyhjään riviin:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Mitätöinnin syy: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Kelpaako tämä? "
@@ -5399,63 +5402,56 @@ msgstr ""
 "voit tehdä erillisiä allekirjoituksia PGP 2.x -muodon avaimilla \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "allekirjoitetaan:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "ei voi avata tiedostoa: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "PGP 2.x -muodon avaimilla voi allekirjoittaa tekstimuotoon \n"
 "vain --pgp2-tilassa\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "käytetään %s-salausta\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "avainta ei ole merkitty turvattomaksi - sitä ei voida käyttää jäljitellyn\n"
 "satunnaislukugeneraattorin kanssa!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "ohitetaan \"%s\": kopio\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ohitetaan \"%s\": tämä on PGP:n luoma ElGamal-avain, jolla ei voi "
 "allekirjoittaa turvallisesti!\n"
@@ -6084,6 +6080,20 @@ msgstr "toiminto on mahdollinen vain, jos suojattu muisti alustetaan\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(olet ehkä käyttänyt tehtävään väärää ohjelmaa)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "valitan, tätä ei voi tehdä eräajossa\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "avainta \"%s\" ei löydy: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "ei voi avata tiedostoa: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                aka \""
diff --git a/po/fr.po b/po/fr.po
index 0dea4230d..0a7f0ce9f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-06-16 20:20+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -42,9 +42,10 @@ msgstr "aucun module de r�cup�ration d'entropie n'a �t� trouv�.\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -78,8 +79,9 @@ msgstr "impossible de lire `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
@@ -305,9 +307,11 @@ msgstr "la cl� secr�te n'est pas disponible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "d�sol�, impossible de faire cela en mode automatique\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "impossible de faire cela en mode automatique\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -481,7 +485,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
@@ -641,11 +645,7 @@ msgstr "mot.pas"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "impossible de faire cela en mode automatique\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Commande> "
 
@@ -654,7 +654,17 @@ msgstr "Commande> "
 msgid "Admin-only command\n"
 msgstr "commandes en conflit\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "commandes en conflit\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "�criture de la cl� secr�te vers `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -681,8 +691,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
@@ -691,13 +701,14 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "cl� '%s' introuvable: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� : %s\n"
@@ -707,7 +718,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(� moins de sp�cifier la cl� par son empreinte)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossible de faire cela en mode automatique sans �--yes�\n"
 
 #: g10/delkey.c:139
@@ -738,7 +750,7 @@ msgstr "il y a une cl� secr�te pour la cl� publique \"%s\" !\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utiliser l'option �--delete-secret-keys� pour l'effacer d'abord.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe: %s\n"
@@ -789,7 +801,7 @@ msgstr ""
 "forcer le chiffrement sym�trique %s (%d) entre en d�saccord\n"
 "avec les pr�ferences du r�cipient\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -869,11 +881,6 @@ msgstr "impossible d'ex�cuter %s � %s �: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossible d'ex�cuter %s � %s �: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "impossible de cr�er `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1175,7 +1182,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
@@ -1183,7 +1190,7 @@ msgstr "Chiffrement: "
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compression: "
 
@@ -1316,7 +1323,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URI du serveur de cl�s\n"
@@ -2468,29 +2475,29 @@ msgstr "[r�vocation]"
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 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:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
@@ -2543,12 +2550,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
@@ -2752,7 +2759,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3105,242 +3112,242 @@ msgstr "montr.photo"
 msgid "show photo ID"
 msgstr "montrer la photo d'identit�"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette cl� ? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "donner la liste de pr�f�rences"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Enlever r�ellement les pr�f�rences des utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossible de cr�er %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoqu�e] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [expire: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [expire: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiance: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revoqu�e] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3348,7 +3355,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3357,7 +3364,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3367,46 +3374,46 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3416,39 +3423,39 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTISSEMENT: Cette cl� � �t� r�voqu�e par son r�vocateur d�sign� !\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3456,130 +3463,130 @@ msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� (o/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'utiliser ? (o/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: �"
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   sign� par %08lX � %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   r�voqu� par %08lX � %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, 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:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4094,108 +4101,108 @@ msgstr ""
 msgid "never     "
 msgstr "jamais    "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Politique de signature critique: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Politique de signature: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENTION: des donn�es de notation invalides ont �t� d�tect�es\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Notation de signature critique: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Notation de signature: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Porte-cl�s"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [expire: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de cl� principale:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "   Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Empreinte de la cl� principale:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "       Empreinte de la sous-cl�:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Empreinte de la cl� ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "v�rification du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s v�rifi�es (%lu signatures)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
@@ -4319,11 +4326,6 @@ msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "cl� '%s' introuvable: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4767,7 +4769,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�me avec l'agent : l'agent renvoie 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4845,23 +4848,23 @@ msgstr "Cette photo est-elle correcte (o/N/q) ? "
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identit� !\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Aucune raison sp�cifi�e"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "La cl� a �t� remplac�e"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "La cl� a �t� compromise"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "La cl� n'est plus utilis�e"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Le nom d'utilisateur n'est plus valide"
 
@@ -4932,7 +4935,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
@@ -5092,8 +5095,8 @@ msgid "skipped: public key already set\n"
 msgstr "ignor�: cl� publique d�j� activ�e\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "r�cipient par d�faut `%s' inconnu\n"
 
 #: g10/pkclist.c:948
@@ -5124,15 +5127,15 @@ msgstr "Signature d�tach�e.\n"
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
@@ -5172,7 +5175,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTE: la cl� a �t� r�voqu�e"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a �chou�: %s\n"
@@ -5182,65 +5185,65 @@ msgstr "build_packet a �chou�: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "cl� %08lX: pas de nom d'utilisateur\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Doit �tre r�voqu� par:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(c'est une cl� de r�vocation sensible)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "sortie avec armure ASCII forc�e.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a �chou�: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de r�vocation cr��.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "aucune cl� de r�vocation trouv�e pour `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "la cl� secr�te `%s' n'a pas �t� trouv�e: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "pas de cl� publique correspondante: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "la cl� publique ne correspond pas � la cl� secr�te !\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette cl� ? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "algorithme de protection inconnu\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTE: Cette cl� n'est pas prot�g�e !\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5260,33 +5263,33 @@ msgstr ""
 "le syst�me d'impression de votre machine pourrait stocker ces\n"
 "donn�es et les rendre accessibles � d'autres personnes !\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "choisissez la cause de la r�vocation:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Annuler"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Vous devriez s�rement s�lectionner %d ici)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Entrez une description optionnelle ; terminez-l� par une ligne vide:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Cause de r�vocation: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Est-ce d'accord ? "
@@ -5474,12 +5477,12 @@ msgstr ""
 "il n'est possible g�n�rer une signature d�tach�e avec des cl�s de\n"
 "style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5487,51 +5490,44 @@ msgstr ""
 "forcer l'algorithme de chiffrement %s (%d) entre en d�saccord avec\n"
 "les pr�f�rences du r�cipient\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "signature:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "impossible d'ouvrir le fichier: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature en texte clair avec des cl�s\n"
 "de style PGP 2.x qu'en mode --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "le chiffrement %s sera utilis�\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la cl� n'est pas marqu�e comme non-s�re; on ne peut pas l'utiliser avec le\n"
 "pseudo-g�n�rateur de nombres al�atiores !\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' a �t� ignor�: dupliqu�\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "`%s' a �t� ignor�: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ignor�: cl� secr�te d�j� pr�sente\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "`%s' a �t� ignor�e: c'est une cl� ElGamal g�n�r�e par PGP qui n'est pas\n"
 "s�re pour les signatures !\n"
@@ -6168,6 +6164,20 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� un programme non adapt� � cette fin)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "d�sol�, impossible de faire cela en mode automatique\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "cl� '%s' introuvable: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "impossible de cr�er `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "impossible d'ouvrir le fichier: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "              alias \""
diff --git a/po/gl.po b/po/gl.po
index 0acc9939d..97fe6d719 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -35,9 +35,10 @@ msgstr "non se detectou un m�dulo de acumulaci�n de entrop�a\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -69,8 +70,9 @@ msgstr "non se pode ler de `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
@@ -297,9 +299,11 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "non se pode facer iso no modo por lotes\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -473,7 +477,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
@@ -632,11 +636,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "non se pode facer iso no modo por lotes\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
@@ -645,7 +645,17 @@ msgstr "Comando> "
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "comandos conflictivos\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "gravando a chave secreta en `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -673,8 +683,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -683,13 +693,14 @@ msgstr "non se puido abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
@@ -699,7 +710,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a menos que especifique a chave por pegada dactilar)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr ""
 "iso non se pode facer no modo de procesamento por lotes sen \"--yes\"\n"
 
@@ -731,7 +743,7 @@ msgstr "�hai unha chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "empregue a opci�n \"--delete-secret-keys\" para borrala primeiro.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -778,7 +790,7 @@ msgid ""
 msgstr ""
 "forza-la cifra sim�trica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -855,11 +867,6 @@ msgstr "non se puido executar %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "non se puido executar %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "non se pode crear `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1156,7 +1163,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1164,7 +1171,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -1284,7 +1291,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
@@ -2427,29 +2434,29 @@ msgstr "[revocaci�n]"
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 sinatura err�nea\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d sinaturas err�neas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 sinatura non verificada debido a un erro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d sinaturas non verificadas debido a erros\n"
@@ -2502,12 +2509,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
@@ -2706,7 +2713,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3059,242 +3066,242 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, 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:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, 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:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, 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:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3302,7 +3309,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3310,7 +3317,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3319,47 +3326,47 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3369,165 +3376,165 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Non hai chave secundaria con �ndice %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4035,107 +4042,107 @@ msgstr ""
 msgid "never     "
 msgstr "nunca     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Normativa de sinaturas cr�ticas: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Normativa de sinaturas: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atop�ronse datos de notaci�n non v�lidos\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Notaci�n de sinaturas cr�ticas: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [caduca: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
@@ -4259,11 +4266,6 @@ msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "non se atopou a chave `%s': %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4697,7 +4699,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "non se pode consulta-lo contrasinal en modo de proceso por lotes\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4774,23 +4777,23 @@ msgstr "�� esta foto correcta (s/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "�non se pode amosa-la identificaci�n fotogr�fica!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "A chave � obsoleta"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Esta chave quedou descoberta"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Xa non se emprega esta chave"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "O ID de usuario xa non � v�lido"
 
@@ -4861,7 +4864,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "�A s�a decisi�n? "
 
@@ -5021,8 +5024,8 @@ msgid "skipped: public key already set\n"
 msgstr "omitido: chave p�blica xa estabrecida\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
 #: g10/pkclist.c:948
@@ -5051,15 +5054,15 @@ msgstr "Sinatura non adxunta.\n"
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
@@ -5097,7 +5100,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave est� revocada"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "a chamada a build_packet fallou: %s\n"
@@ -5107,65 +5110,65 @@ msgstr "a chamada a build_packet fallou: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Ha ser revocada por:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Esta � unha chave de revocaci�n sensible)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Forzouse unha sa�da con armadura ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "a chamada a make_keysig_packet fallou: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Creouse o certificado de revocaci�n.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "non se atoparon chaves de revocaci�n para `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave secreta `%s': %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: �Esta chave non est� protexida!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5183,33 +5186,33 @@ msgstr ""
 "se volve ilexible. Pero te�a coidado: o sistema de impresi�n da s�a\n"
 "m�quina poder�a armacena-los datos e deix�rllelos dispo�ibles a outros.\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(probablemente queira seleccionar %d aqu�)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduza unha descrici�n opcional; rem�tea cunha li�a en branco:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo para a revocaci�n: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�� correcto? "
@@ -5388,61 +5391,54 @@ msgstr ""
 "s� pode asinar nun ficheiro separado con chaves estilo PGP 2.x no modo --"
 "pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "asinando:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "non se puido abrir un ficheiro: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode asinar en claro con chaves estilo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "hase empregar cifrado %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave non est� marcada coma insegura - non se pode empregar co xerador de "
 "n�meros aleatorios falso\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "om�tese `%s': duplicada\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "om�tese `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "om�tese `%s': �esta � unha chave ElGamal xerada por PGP que non � segura "
 "para sinaturas!\n"
@@ -6075,6 +6071,20 @@ msgstr "a operaci�n non � posible sen memoria inicializada como segura\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pode que usara o programa equivocado para esta tarefa)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "sent�molo, non se pode facer isto no modo por lotes\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "non se atopou a chave `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "non se pode crear `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "non se puido abrir un ficheiro: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "               alias \""
diff --git a/po/hu.po b/po/hu.po
index 9ba99471e..a883b40db 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -35,9 +35,10 @@ msgstr "Nem �szleltem entr�piagy�jt� modult.\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -70,8 +71,9 @@ msgstr "Nem tudom olvasni a(z) \"%s\" �llom�nyt: %s.\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -295,9 +297,11 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -471,7 +475,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
@@ -630,11 +634,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban!\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Parancs> "
 
@@ -643,7 +643,17 @@ msgstr "Parancs> "
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "Egym�snak ellentmond� parancsok!\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -670,8 +680,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -680,13 +690,14 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
@@ -696,7 +707,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(Kiv�ve, ha megad egy kulcsot az ujjlenyomat�val.)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "Nem tudom ezt megcsin�lni k�tegelt m�dban \"--yes\" n�lk�l.\n"
 
 #: g10/delkey.c:139
@@ -727,7 +739,7 @@ msgstr "Van egy titkos kulcs a \"%s\" nyilv�nos kulcshoz!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "El�sz�r azt t�r�lje a \"--delete-secret-keys\" opci�val!\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -772,7 +784,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "A %s (%d) rejtjelez� haszn�lata s�rti a c�mzett preferenci�it!\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,11 +858,6 @@ msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Nem tudom v�grehajtani a k�vetkez� \"%s\"-t: \"%s\": %s.\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1145,7 +1152,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
@@ -1153,7 +1160,7 @@ msgstr "Rejtjelez� (cipher): "
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
@@ -1272,7 +1279,7 @@ msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
@@ -2413,29 +2420,29 @@ msgstr "[visszavon�s]"
 msgid "[self-signature]"
 msgstr "[�nal��r�s]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 rossz al��r�s.\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d rossz al��r�s.\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 al��r�st nem ellen�riztem hiba miatt.\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d al��r�st nem ellen�riztem hiba miatt.\n"
@@ -2489,12 +2496,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
@@ -2693,7 +2700,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3046,240 +3053,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 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:1547
+#: g10/keyedit.c:1551
 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:1549
+#: g10/keyedit.c:1553
 #, 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:1550
+#: g10/keyedit.c:1554
 #, 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:1600
+#: g10/keyedit.c:1604
 #, 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:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, 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:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, 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:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3287,7 +3294,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3295,7 +3302,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3305,45 +3312,45 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3353,162 +3360,162 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 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:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 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:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 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:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nincs %d index� m�sodlagos kulcs!\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, 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:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, 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"
@@ -4014,107 +4021,107 @@ msgstr ""
 msgid "never     "
 msgstr "soha      "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kritikus al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Al��r�si elj�r�sm�d: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "FIGYELEM: �rv�nytelen jel�l� adatot tal�ltam.\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kritikus al��r�s-jel�l�s: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [lej�r: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr "Els�dlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
@@ -4238,11 +4245,6 @@ msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4680,7 +4682,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "Nem tudok jelsz�t bek�rni k�tegelt m�dban!\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4758,23 +4761,23 @@ msgstr "Ez a fot� megfelel� (i/N/k)? "
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjelen�teni a fot�azonos�t�t!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Nincs megadva ok."
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "A kulcsot lecser�lt�k."
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "A kulcs kompromitt�l�dott."
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "A kulcs m�r nem haszn�latos."
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "A felhaszn�l�i azonos�t� m�r nem �rv�nyes."
 
@@ -4845,7 +4848,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Mit v�laszt? "
 
@@ -5001,8 +5004,8 @@ msgid "skipped: public key already set\n"
 msgstr "Kihagyva: Nyilv�nos kulcs m�r be lett �ll�tva.\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
 #: g10/pkclist.c:948
@@ -5032,15 +5035,15 @@ msgstr "K�l�n�ll� al��r�s.\n"
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
@@ -5078,7 +5081,7 @@ msgid "NOTE: key has been revoked"
 msgstr "MEGJEGYZ�S: A kulcsot visszavont�k."
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet sikertelen: %s.\n"
@@ -5088,65 +5091,65 @@ msgstr "build_packet sikertelen: %s.\n"
 msgid "key %s has no user IDs\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Visszavonja:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ez egy �rz�keny visszavon� kulcs.)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-p�nc�lozott kimenet kiv�lasztva.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet sikertelen: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Visszavon� igazol�s l�trehozva.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "Nem tal�ltam visszavon� kulcsot a k�vetkez�h�z: \"%s\".\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "\"%s\" titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez a kulcshoz? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "MEGJEGYZ�S: Ez a kulcs nem v�dett.\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5164,33 +5167,33 @@ msgstr ""
 "adathordoz� olvashatatlann� v�lik. De vigy�zat: az �n g�p�nek nyomtat�si\n"
 "rendszere is t�rolhatja az adatot, �s m�sok esetleg hozz�f�rhetnek ehhez!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Val�sz�n�leg a(z) %d. lehet�s�get akarja v�lasztani.)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Adjon meg egy nem k�telez� le�r�st! �res sorral fejezze be:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Visszavon�s oka: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ez �gy rendben van? "
@@ -5361,12 +5364,12 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "K�l�n�ll� al��r�st PGP 2.x st�lus� kulcsokkal csak --pgp2 m�dban k�sz�thet!\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5374,50 +5377,43 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "Al��rom:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "Olvashat� sz�veget PGP 2.x st�lus� kulccsal csak --pgp2 m�dban �rhat al�!\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s titkos�t�st fogok haszn�lni.\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "A kulcs nincs \"nem biztons�gosnak\" jel�lve,\n"
 "nem tudom a p�tl� v�letlensz�m-gener�torral haszn�lni!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "\"%s\"-t kihagytam: m�sodp�ld�ny.\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "Kihagytam \"%s\"-t: ez egy PGP �ltal l�trehozott ElGamal kulcs, amely nem\n"
 "biztons�gos al��r�sokhoz!\n"
@@ -6046,6 +6042,20 @@ msgstr "A m�velet nem lehets�ges biztons�gos mem�ria n�lk�l.\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(Lehet, hogy nem a megfelel� programot haszn�lja a feladatra.)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "Sajn�lom, ezt nem tudom megcsin�lni k�tegelt m�dban!\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "               azaz \""
diff --git a/po/id.po b/po/id.po
index 61675c4dd..809acd1ce 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -37,9 +37,10 @@ msgstr "modul entropi gathering tidak terdeteksi\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -71,8 +72,9 @@ msgstr "tidak dapat membaca `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
@@ -297,9 +299,11 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -473,7 +477,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
@@ -632,11 +636,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Perintah> "
 
@@ -645,7 +645,17 @@ msgstr "Perintah> "
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "perintah saling konflik\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "menulis kunci rahasia ke `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -672,8 +682,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -682,13 +692,14 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "gagal membaca keyblock: %s\n"
@@ -698,7 +709,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(kecuali anda menspesifikasikan kunci dengan fingerprint)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "tidak dapat dilakukan dalam mode batch tanpa \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -729,7 +741,7 @@ msgstr "terdapat kunci rahasia untuk kunci publik \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "gunakan pilihan \"--delete-secret-key\" untuk menghapusnya.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -776,7 +788,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -850,11 +862,6 @@ msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "tidak dapat mengeksekusi %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "tidak dapat membuat %s: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1149,7 +1156,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -1157,7 +1164,7 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Kompresi: "
 
@@ -1276,7 +1283,7 @@ msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
@@ -2425,29 +2432,29 @@ msgstr "[pembatalan]"
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 signature yang buruk\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d signature yang buruk\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signature tidak diperiksa karena kesalahan\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signature tidak diperiksa karena ada kesalahan\n"
@@ -2501,12 +2508,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
@@ -2709,7 +2716,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3062,240 +3069,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3303,7 +3310,7 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3311,7 +3318,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3321,45 +3328,45 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3369,165 +3376,165 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Tidak ada kunci sekunder dengan index %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, 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"
@@ -4031,107 +4038,107 @@ msgstr ""
 msgid "never     "
 msgstr "tidak pernah..."
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kebijakan signature kritis: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Kebijakan signature: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Notasi signature kritis: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Notasi signature: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [berakhir: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
@@ -4254,11 +4261,6 @@ msgstr "Penerimaan keyserver gagal: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "kunci '%s' tidak ditemukan: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4689,7 +4691,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4768,23 +4771,23 @@ msgstr "Apakah foto ini benar (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Kunci dilampaui"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Kunci ini telah dikompromikan"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Kunci tidak lagi digunakan"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "ID User tidak lagi valid"
 
@@ -4855,7 +4858,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Keputusan anda? "
 
@@ -5010,8 +5013,8 @@ msgid "skipped: public key already set\n"
 msgstr "dilewati: kunci publik telah diset\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5040,15 +5043,15 @@ msgstr "Menghapus signature.\n"
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
@@ -5086,7 +5089,7 @@ msgid "NOTE: key has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet gagal: %s\n"
@@ -5096,65 +5099,65 @@ msgstr "build_packet gagal: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Akan dibatalkan oleh:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Ini adalah kunci pembatalan sensitif)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Pemaksaan output mode ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "gagal make_keysig_packet: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "tidak ditemukan kunci pembatalan untuk `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "kunci rahasia `%s' tidak ditemukan: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "CATATAN: Kunci ini tidak diproteksi!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5174,34 +5177,34 @@ msgstr ""
 "pencetakan\n"
 "mesin anda mungkin menyimpan data dan menyediakannya untuk yang lain!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Batal"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Mungkin anda ingin memilih %d di sini)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "Masukkan sebuah deskripsi opsional; akhiri dengan sebuah baris kosong:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Alasan pembatalan: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Ini oke? "
@@ -5371,62 +5374,55 @@ msgstr ""
 "anda hanya dapat detach-sign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "menandai:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "tidak dapat membuka file: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat clearsign dengan kunci bergaya PGP 2.x saat dalam mode --"
 "pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s enkripsi akan digunakan\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "kunci tidak dianggap sebagai tidak aman - tidak dapat digunakan dengan RNG "
 "palsu!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "lewati `%s': terduplikasi\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "melewati `%s': ini adalah kunci ElGamal yang dihasilkan PGP yang tidak aman "
 "untuk signature!\n"
@@ -6055,6 +6051,20 @@ msgstr "operasi tidak mungkin tanpa menginisialisasi memori yang aman\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(anda mungkin menggunakan program yang salah untuk tugas ini)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "maaf, tidak dapat melakukan hal ini dalam mode batch\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "kunci '%s' tidak ditemukan: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "tidak dapat membuat %s: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "tidak dapat membuka file: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "              alias \""
diff --git a/po/it.po b/po/it.po
index 6cb2a46a8..cae774fd5 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -35,9 +35,10 @@ msgstr "non � stato trovato il modulo per raccogliere l'entropia\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -70,8 +71,9 @@ msgstr "impossibile leggere `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
@@ -298,9 +300,11 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "impossibile fare questo in modo batch\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -475,7 +479,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
@@ -634,11 +638,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "impossibile fare questo in modo batch\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
@@ -647,7 +647,17 @@ msgstr "Comando> "
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "comandi in conflitto\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "scrittura della chiave segreta in `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -674,8 +684,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -684,13 +694,14 @@ msgstr "impossibile aprire `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "errore leggendo il keyblock: %s\n"
@@ -700,7 +711,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a meno che la chiave sia specificata con il fingerprint)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "impossibile fare questo in modo batch senza \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -731,7 +743,7 @@ msgstr "c'� una chiave segreta per la chiave pubblica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "usa prima l'opzione \"--delete-secret-keys\" per cancellarla.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -782,7 +794,7 @@ msgstr ""
 "forzare il cifrario simmetrico %s (%d) viola le preferenze\n"
 "del destinatario\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -862,11 +874,6 @@ msgstr "impossibile eseguire %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "impossibile eseguire %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "impossibile creare `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1160,7 +1167,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifrari: "
 
@@ -1168,7 +1175,7 @@ msgstr "Cifrari: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compressione: "
 
@@ -1290,7 +1297,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
@@ -2438,29 +2445,29 @@ msgstr "[revoca]"
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "una firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "una firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
@@ -2514,12 +2521,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
@@ -2720,7 +2727,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3073,240 +3080,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3315,7 +3322,7 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3324,7 +3331,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3333,46 +3340,46 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3382,168 +3389,168 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4050,107 +4057,107 @@ msgstr ""
 msgid "never     "
 msgstr "mai       "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Politica critica di firma: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Politica di firma: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Annotazione critica della firma: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[scadenza: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "    Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
@@ -4276,11 +4283,6 @@ msgstr "ricezione dal keyserver fallita: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "chiave `%s' non trovata: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4713,7 +4715,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4793,23 +4796,23 @@ msgstr "Questa foto � giusta? (s/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Nessuna ragione specificata"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Questa chiave � stata sostituita"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Questa chiave � stata compromessa"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "La chiave non � pi� usata"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "L'user ID non � pi� valido"
 
@@ -4880,7 +4883,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
@@ -5037,8 +5040,8 @@ msgid "skipped: public key already set\n"
 msgstr "saltata: chiave pubblica gi� impostata\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
 #: g10/pkclist.c:948
@@ -5068,15 +5071,15 @@ msgstr "Firma separata.\n"
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
@@ -5115,7 +5118,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: la chiave � stata revocata"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet fallito: %s\n"
@@ -5125,65 +5128,65 @@ msgstr "build_packet fallito: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Revocabile da:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Questa � una chiave di revoca sensibile)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Forzato l'output con armatura ASCII.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet fallito: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Certificato di revoca creato.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "non sono state trovate chiavi di revoca per `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "chiave segreta `%s' non trovata: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Creare un certificato di revoca per questa chiave? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOTA: Questa chiave non � protetta!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5203,33 +5206,33 @@ msgstr ""
 "disponibili\n"
 "ad altri!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Cancella"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabilmente volevi scegliere %d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Inserisci una descrizione opzionale; terminala con una riga vuota:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motivo della revoca: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Va bene cos�? "
@@ -5416,62 +5419,55 @@ msgstr ""
 "nella modalit� --pgp2 puoi fare firme separate solo con chiavi in stile PGP "
 "2.x\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "firma:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "impossibile aprire il file: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "In modalit� -pgp2 puoi firmare in chiaro solo con chiavi in stile PGP 2.x\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "sar� usato il cifrario %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "la chiave non � indicata come insicura - impossibile usarla con il RNG "
 "finto!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "saltata `%s': doppia\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "saltata `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "saltata %s: questa � una chiave ElGamal generata da PGP che NON � sicura per "
 "le firme!\n"
@@ -6101,6 +6097,20 @@ msgstr "l'operazione non � possibile senza memoria sicura inizializzata\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(potresti avere usato il programma sbagliato per questa funzione)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "mi dispiace, non � possibile fare questo in modo batch\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "chiave `%s' non trovata: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "impossibile creare `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "impossibile aprire il file: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                alias \""
diff --git a/po/ja.po b/po/ja.po
index 490573730..1b0c31c7d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2003-12-06 00:44+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -38,9 +38,10 @@ msgstr "����ȥ��ԡ������⥸�塼�뤬�����Ф���Ƥ��ޤ���\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -72,8 +73,9 @@ msgstr "��%s�פ��ɤ�ޤ���: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
@@ -297,9 +299,11 @@ msgstr "��̩���������ޤ���"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -473,7 +477,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
@@ -632,11 +636,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "����ϥХå��⡼�ɤǤϤǤ��ޤ���\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "���ޥ��> "
 
@@ -645,7 +645,17 @@ msgstr "���ޥ��> "
 msgid "Admin-only command\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "��Ω���륳�ޥ��\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�פ򻲾�)\n"
 
@@ -672,8 +682,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -682,13 +692,14 @@ msgstr "��%s�פ������ޤ���\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "���֥��å����ɹ��ߥ��顼: %s\n"
@@ -698,7 +709,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(���뤤�ϡ�����Ǹ������)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��--yes�פΤʤ��Хå��⡼�ɤǤϤǤ��ޤ���\n"
 
 #: g10/delkey.c:139
@@ -729,7 +741,7 @@ msgstr "���θ������ˤ���������̩����%s�פ�����ޤ�!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�ޤ���--delete-secret-keys�ץ��ץ����Ǥ���������Ƥ���������\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
@@ -773,7 +785,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�оΰŹ楢�르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,11 +858,6 @@ msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�¹ԤǤ��ޤ��� %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1149,7 +1156,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�Ź�: "
 
@@ -1157,7 +1164,7 @@ msgstr "�Ź�: "
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "����: "
 
@@ -1276,7 +1283,7 @@ msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź��ĥ��%s�פ�����ɤ��ޤ���\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s�ϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URI�������ǽ\n"
@@ -2397,29 +2404,29 @@ msgstr "[����]"
 msgid "[self-signature]"
 msgstr "[���ʽ�̾]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "̵���ʽ�̾1��\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "̵���ʽ�̾%d��\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�����ʤ�����1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�����ʤ�����%d�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "���顼�Τ���1�Ĥν�̾�򸡺����ޤ���\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "���顼�Τ���%d�Ĥν�̾�򸡺����ޤ���\n"
@@ -2472,12 +2479,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�פϡ���������Ƥ��ޤ���"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
@@ -2673,7 +2680,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3027,240 +3034,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�פ��ɹ��ߥ��顼: %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ץ��ޥ�ɤ�ȤäƤ�������\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ��Ѥ��뤳�ȤϤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "���θ��������˼������ޤ���? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "�������������"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩���ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ����Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "���θ��ϡ�%s���ˤ�äƼ������줿�褦�Ǥ� "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (�ǥꥱ����)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s������Ǥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [ͭ������: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [ͭ������: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[����] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3268,7 +3275,7 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ���֤��Ƥ���������\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3276,7 +3283,7 @@ msgstr ""
 "�ٹ�: ��Ȥʤ�桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3285,45 +3292,45 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3332,159 +3339,159 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ʤ����⤷��ޤ���\n"
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "�ٹ�: ���θ����ܿͤˤ�äƼ�������Ƥ��ޤ�!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ����ꤷ�ޤ���? (y/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����id��%s�פ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "����Ǥ������˻��Ѥ������Ǥ��� (y/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d�֤������Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s�Ǵ����ڤ�Ǥ���\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺�����������ޤ���? (y/N) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˽�̾���ޤ���:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺��ޤ���? (y/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�פϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s�򥵥���%ld�θ�0x%08lX (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -3984,107 +3991,107 @@ msgstr ""
 msgid "never     "
 msgstr "̵����    "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "����ƥ�����ʽ�̾�ݥꥷ��: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "��̾�ݥꥷ��: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "�ٹ�: ̵��������ǡ���������ޤ�\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "����ƥ�����ʽ�̾����: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "��̾����: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "����"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [ͭ������: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "�縰�λ���:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "�������:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " �縰�λ���:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr " �������:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "                ���� ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "���ΰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򸡺����Ƥ��ޤ�\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǸ��� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
@@ -4207,11 +4214,6 @@ msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4640,7 +4642,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4717,23 +4720,23 @@ msgstr "���μ̿����������Ǥ��� (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "�ե���ID��ɽ����ǽ!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "��ͳ�ϻ��ꤵ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "�����Ȥ꤫��äƤ��ޤ�"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "�����ѥ����ޤ���"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "���Ϥ⤦�Ȥ��Ƥ��ޤ���"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "�桼����ID���⤦ͭ���Ǥ���ޤ���"
 
@@ -4804,7 +4807,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "���ʤ��η����? "
 
@@ -4956,8 +4959,8 @@ msgid "skipped: public key already set\n"
 msgstr "�����å�: ������������ѤߤǤ�\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "����μ���͡�%s�פ����Ĥ���ޤ���\n"
 
 #: g10/pkclist.c:948
@@ -4988,15 +4991,15 @@ msgstr "ʬΥ��̾��\n"
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɹ����� ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ���`%s'�������ޤ���\n"
@@ -5034,7 +5037,7 @@ msgid "NOTE: key has been revoked"
 msgstr "����: ���ϼ����ѤߤǤ�"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
@@ -5044,65 +5047,65 @@ msgstr "build_packet �˼��Ԥ��ޤ���: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "��%08lX: �桼����ID������ޤ���\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "������:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(����ϡ��ǥꥱ���Ȥʼ������Ǥ�)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII�������Ϥ������ޤ���\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet �˼��Ԥ��ޤ���: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "����������������\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "��%s���Ѥμ������ϡ�����ޤ���\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "��̩����%s�פ����Ĥ���ޤ���: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�б����������������ޤ���: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "���ν�̾�ˤ������뼺�����������ޤ���? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "̤�Τ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "����: ���θ����ݸ��Ƥ��ޤ���!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5120,33 +5123,33 @@ msgstr ""
 "�������Ǥ��������������դ��Ƥ������������ʤ��Υޥ���ΰ��������ƥ�ϡ�\n"
 "����Ǥ⸫������˥ǡ����򤪤����Ȥ�����ޤ�!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "��������ͳ�����򤷤Ƥ�������:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "����󥻥�"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(�����ǤϤ��ä�%d�����Ӥޤ�)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "ͽ�������������ϡ����Ԥǽ�λ:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "������ͳ: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "��������Ǥ���? "
@@ -5299,60 +5302,53 @@ msgstr "%s��̾����̾��: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϡ�PGP 2.x�����θ���ʬΥ��̾�Ǥ�������Ǥ�\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "��%s�פؤν�Ф�\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "��̾:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "�ե����뤬�����ޤ���: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�PGP 2.x�����θ��ǥ��ꥢ��̾�����Ǥ��ޤ���\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s�Ź沽����Ѥ��ޤ�\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "���ݤǤ���Ȥ����ե饰�����ˤ����ꤵ��Ƥ��ޤ���\n"
 "��ʪ��������ҤȤϤ��ä���˻Ȥ��ޤ���!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�פ򥹥��å�: ��ʣ\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "��%s�פ򥹥��å�: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "�����å�: ��̩���ϴ��ˤ���ޤ�\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "��%s�פ򥹥��å�: �����PGP����������ElGamal���Ǥ���\n"
 "��̾���Ѥ���ˤϡ������ǤϤ���ޤ���!\n"
@@ -5981,6 +5977,20 @@ msgstr "������Ѥߤΰ����ʥ��꡼���ʤ����ˤϼ¹ԤǤ��ޤ���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������Ū�ˤϸ��ä��ץ��������Ѥ����ΤǤ��礦)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "��ǰ�ʤ��顢�Хå��⡼�ɤǤϤǤ��ޤ���\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "����%s�פ����Ĥ���ޤ���: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "��%s�פ��Ǥ��ޤ���: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "�ե����뤬�����ޤ���: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "       ��̾ \""
diff --git a/po/nl.po b/po/nl.po
index f859e6d0f..f0c5fd68d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-05-10 19:23+0200\n"
 "Last-Translator: Elros Cyriatan <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -37,9 +37,10 @@ msgstr "geen entropie verzamelende module gevonden\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan `%s' niet openen: %s\n"
@@ -72,8 +73,9 @@ msgstr "kan `%s' niet lezen: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "let op: random_seed bestand niet bijgewerkt\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan `%s' niet aanmaken: %s\n"
@@ -299,9 +301,11 @@ msgstr "geheime sleutel niet beschikbaar"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "sorry, dat kan niet in batch-modus\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "dat kan niet in batch-modus\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -475,7 +479,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Ongeldige keuze.\n"
 
@@ -634,11 +638,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "dat kan niet in batch-modus\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Opdracht> "
 
@@ -647,7 +647,17 @@ msgstr "Opdracht> "
 msgid "Admin-only command\n"
 msgstr "conflicterende opdrachten\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "conflicterende opdrachten\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "bezig met schrijven geheime sleutel naar `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ongeldige opdracht (probeer \"hulp\")\n"
 
@@ -674,8 +684,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
@@ -684,13 +694,14 @@ msgstr "kan `%s' niet openen\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--uitvoer werkt niet voor deze opdracht\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "sleutel `%s' niet gevonden: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fout bij lezen sleutelblok: %s\n"
@@ -700,7 +711,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(tenzij u de sleutel aangeeft met de vingerafdruk)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "dat kan niet in batch-modus zonder \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -732,7 +744,7 @@ msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr ""
 "gebruik de optie \"--delete-secret-keys\" om deze eerst te verwijderen.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fout bij maken wachtwoord: %s\n"
@@ -781,7 +793,7 @@ msgstr ""
 "het afdwingen van symmetrische codering %s (%d) gaat tegen de voorkeuren van "
 "de ontvanger in\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -861,11 +873,6 @@ msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "kan %s \"%s\" niet uitvoeren: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "kan `%s' niet aanmaken: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1163,7 +1170,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Openbare sleutel: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Codering: "
 
@@ -1171,7 +1178,7 @@ msgstr "Codering: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compressie: "
 
@@ -1291,7 +1298,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s is geen geldige tekenset\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kon sleutelserver URI niet inlezen\n"
@@ -2458,29 +2465,29 @@ msgstr "[herroeping]"
 msgid "[self-signature]"
 msgstr "[zelfondertekening]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 slechte ondertekening\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d slechte ondertekeningen\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ondertekening niet gecontroleerd vanwege een ontbrekende sleutel\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d ondertekeningen niet gecontroleerd vanwege ontbrekende sleutels\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ondertekening niet gecontroleerd vanwege een fout\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d ondertekeningen niet gecontroleerd vanwege fouten\n"
@@ -2535,12 +2542,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Gebruikerscode \"%s\" is herroepen."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Weet u zeker dat u deze toch wilt ondertekenen? (j/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Kan niet ondertekenen.\n"
 
@@ -2745,7 +2752,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Echt ondertekenen? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3098,240 +3105,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "foto ID weergeven"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fout bij lezen geheim sleutelblok `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Geheime sleutel is beschikbaar.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "De geheime sleutel is nodig om dit te doen.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Gebruik alstublieft eerst de \"toggle\" opdracht.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Sleutel is herroepen."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Echt alle gebruikerscodes ondertekenen? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Selecteer de gebruikerscodes om te ondertekenen\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Deze opdracht is niet toegestaan in %s modus.\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "U dient tenminste één gebruikerscode te selecteren.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "U kunt niet de laatste gebruikerscode verwijderen!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Echt alle geselecteerde gebruikerscodes verwijderen? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Echt deze gebruikerscode verwijderen? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Echt deze gebruikerscode verwijderen? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "U dient tenminste één sleutel te selecteren.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "U dient tenminste één sleutel te selecteren.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Wilt u echt de geselecteerde sleutels verwijderen? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Wilt u echt deze sleutel verwijderen? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Echt alle geselecteerde gebruikerscodes herroepen? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Echt deze gebruikerscode herroepen? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Wilt u echt de geselecteerde sleutels herroepen? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Wilt u echt deze sleutel herroepen? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "voorkeurenlijst instellen"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Echt de voorkeuren bijwerken voor de geselecteerde gebruikerscodes? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Echt de voorkeuren bijwerken? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Wijzigingen opslaan? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afsluiten zonder op te slaan? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "bijwerken mislukt: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "bijwerken geheim mislukt: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Sleutel niet gewijzigd dus bijwerken niet nodig.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Samenvatting: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Mogelijkheden: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Deze sleutel is mogelijk herroepen door sleutel %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (gevoelig)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan %s niet aanmaken: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[herroepen] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [verloopt: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verloopt: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " vertrouwen: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " vertrouwen: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Deze sleutel is uit gezet"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[herroepen] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Er zijn geen voorkeuren op een PGP 2.x stijl gebruikerscode.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3340,13 +3347,13 @@ msgstr ""
 "juist\n"
 "is tenzij u het programma opnieuw start.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3356,45 +3363,45 @@ msgstr ""
 "kan\n"
 "         zorgen dat sommige versies van PGP deze sleutel verwerpen.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Weet u zeker dat u deze toch wilt toevoegen? (j/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "U kunt geen foto ID toevoegen aan een PGP2 stijl sleutel.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deze goede ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deze ongeldige ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deze onbekende ondertekening verwijderen? (j/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Echt deze zelfondertekening verwijderen? (j/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d ondertekening verwijderd.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d ondertekeningen verwijderd.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Niets verwijderd.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3404,166 +3411,166 @@ msgstr ""
 "         toevoegen kan zorgen dat sommige versies van PGP deze sleutel "
 "verwerpen.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "U kunt geen aangestelde herroeper toevoegen aan een PGP 2.x stijl sleutel.\n"
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geef de gebruikerscode van de aangestelde herroeper: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "kan een PGP 2.x stijl sleutel niet aanwijzen als een aangestelde herroeper\n"
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "u kunt geen sleutel aanwijzen als zijn eigen aangestelde herroeper\n"
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "WAARSCHUWING: Deze sleutel is herroepen door zijn eigenaar!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WAARSCHUWING: het aanwijzen van een sleutel als een aangestelde herroeper "
 "kan niet ongedaan gemaakt worden!\n"
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Wilt u echt deze sleutel aanwijzen als een aangestelde herroeper? (j/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Verwijder alstublieft selecties van de geheime sleutels.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Selecteer alstublieft ten hoogste één secundaire sleutel.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "De verlooptijd voor een secundaire sleutel wordt gewijzigd.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "De verlooptijd voor de primaire sleutel wordt gewijzigd.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "U kunt de verlooptijd van een v3-sleutel niet wijzigen\n"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Geen geassocieerde ondertekening in geheime sleutelbos\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Selecteer alstublieft precies één gebruikerscode.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "v3-zelfondertekening op gebruikerscode \"%s\" wordt overgeslagen\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Weet u zeker dat u deze wilt gebruiken (j/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Geen gebruikerscode met index %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Geen secundaire sleutel met index %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "gebruikerscode: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ondertekend door %08lX op %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (niet-uitvoerbaar)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Deze ondertekening is verlopen op %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Weet u zeker dat u deze nog steeds wilt herroepen? (j/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Een herroepingscertificaat maken voor deze ondertekening? (j/N) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "U heeft deze gebruikerscodes ondertekend:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (niet-uitvoerbaar)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   herroepen door %08lX op %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "U staat op het punt deze ondertekeningen te herroepen:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Echt de herroepingscertificaten maken? (j/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "geen geheime sleutel\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "gebruikerscode \"%s\" is al herroepen\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WAARSCHUWING: een gebruikerscode ondertekening is van %d seconden in de "
 "toekomst\n"
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4076,107 +4083,107 @@ msgstr ""
 msgid "never     "
 msgstr "nooit"
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kritisch ondertekenbeleid: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Ondertekenbeleid: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "WAARSCHUWING: ongeldige notatiegegevens gevonden\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kritische ondertekennotatie: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Ondertekennotatie: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "niet leesbaar voor mensen"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Sleutelbos"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [verloopt: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Vingerafdruk primaire sleutel:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Vingerafdruk deelsleutel:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Vingerafdruk primaire sleutel:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Vingerafdruk deelsleutel:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Vingerafdruk sleutel ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "bepantseren mislukt: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "WAARSCHUWING: 2 bestanden met vertrouwelijke informatie bestaan.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s is de ongewijzigde\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s is de nieuwe\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Repareer alstublieft dit mogelijke veiligheidsrisico\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "bezig met controleren sleutelbos `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu sleutels gecontroleerd (%lu ondertekeningen)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: sleutelbos aangemaakt\n"
@@ -4300,11 +4307,6 @@ msgstr "Sleutelaanmaak mislukt: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "sleutel `%s' niet gevonden: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4743,7 +4745,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probleem met agent: agent geeft 0x%lx terug\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "kan niet vragen om wachtwoord in batch-modus\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4821,23 +4824,23 @@ msgstr "Is deze foto goed (j/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "kan foto ID niet weergeven!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Geen reden opgegeven"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Sleutel is achterhaald"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Sleutel is in gevaar gebracht"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Sleutel wordt niet meer gebruikt"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Gebruikerscode is niet langer geldig"
 
@@ -4908,7 +4911,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Uw beslissing? "
 
@@ -5070,8 +5073,8 @@ msgid "skipped: public key already set\n"
 msgstr "overgeslagen: openbare sleutel reeds ingesteld\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "onbekende standaard ontvanger `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5102,15 +5105,15 @@ msgstr "Losgekoppelde ondertekening.\n"
 msgid "Please enter name of data file: "
 msgstr "Geef bestandsnaam van gegevensbestand: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "bezig met lezen standaard invoer...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "geen ondertekende gegevens\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan ondertekende gegevens `%s' niet openen\n"
@@ -5148,7 +5151,7 @@ msgid "NOTE: key has been revoked"
 msgstr "LET OP: sleutel is herroepen"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet mislukt: %s\n"
@@ -5158,65 +5161,65 @@ msgstr "build_packet mislukt: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "sleutel %08lX: gebruikerscode niet gevonden\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Zal worden herroepen door:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Dit is een gevoelige herroepingssleutel)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Wilt u een herroepingscertificaat aanmaken voor deze sleutel? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII-bepantserde uitvoer afgedwongen.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet mislukt: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Herroepingscertificaat aangemaakt.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "geen herroepingssleutels gevonden voor `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "geheime sleutel `%s' niet gevonden: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "geen geassocieerde openbare sleutel: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "openbare sleutel komt niet overeen met geheime sleutel!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Wilt u een herroepingscertificaat aanmaken voor deze sleutel? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "onbekend beschermingsalgoritme\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "LET OP: deze sleutel wordt niet beschermd!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5235,33 +5238,33 @@ msgstr ""
 "systeem bewaart mogelijk de gegevens en maakt ze beschikbaar voor\n"
 "anderen!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Kies alstublieft een reden voor de herroeping:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Waarschijnlijk wilt u hier %d kiezen)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Geef een optionele beschrijving; eindig met een lege regel:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Reden voor herroeping: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Geen beschrijving gegeven)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Is dit goed? "
@@ -5439,63 +5442,56 @@ msgstr ""
 "u kunt alleen losgekoppeld ondertekenen met PGP 2.x stijl sleutels in in --"
 "pgp2 modus\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "bezig met schrijven naar `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "afdwingen van digest-algoritme %s (%d) overtreedt voorkeuren ontvanger\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "bezig met ondertekenen:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "kan bestand niet openen: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "u kunt alleen niet-gecodeerde ondertekeningen maken met PGP 2.x stijl "
 "sleutels in --pgp2 modus\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s codering zal worden gebruikt\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "sleutel is niet gemarkeerd als onveilig - kan deze niet gebruiken met de nep "
 "RNG!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' overgeslagen: dubbel\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "`%s' overgeslagen: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "overgeslagen: geheime sleutel reeds aanwezig\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "`%s' overgeslagen: dit is een met PGP aangemaakte ElGamal-sleutel die niet "
 "veilig is voor ondertekeningen!\n"
@@ -6125,6 +6121,20 @@ msgstr "bewerking is niet mogelijk zonder geïnitialiseerd veilig geheugen\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(mogelijk heeft u het verkeerde programma gebruikt voor deze taak)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "sorry, dat kan niet in batch-modus\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "sleutel `%s' niet gevonden: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "kan `%s' niet aanmaken: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "kan bestand niet openen: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                alias \""
diff --git a/po/pl.po b/po/pl.po
index f90cef8da..9cc489320 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -45,9 +45,10 @@ msgstr "modu� gromadzenia entropii nie zosta� wykryty\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -80,8 +81,9 @@ msgstr "nie mo�na odczyta� ,,%s'': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
@@ -312,9 +314,11 @@ msgstr "brak klucza prywatnego"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "nie dzia�a w trybie wsadowym\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -490,7 +494,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
@@ -649,11 +653,7 @@ msgstr "has�o"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "nie dzia�a w trybie wsadowym\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Polecenie> "
 
@@ -662,7 +662,17 @@ msgstr "Polecenie> "
 msgid "Admin-only command\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "sprzeczne polecenia\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "zapisuj� klucz tajny w '%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
@@ -690,8 +700,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -700,13 +710,14 @@ msgstr "nie mo�na otworzy� ,,%s''\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "b��d odczytu bloku kluczy: %s\n"
@@ -716,7 +727,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(chyba, �e klucz zostaje wybrany przez podanie odcisku)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez opcji \"--yes\" nie dzia�a w trybie wsadowym\n"
 
 #: g10/delkey.c:139
@@ -747,7 +759,7 @@ msgstr "dla klucza publicznego ,,%s'' istnieje klucz prywatny!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby go usun�� nalezy najpierw u�y� opcji \"--delete-secret-key\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczas tworzenia has�a: %s\n"
@@ -794,7 +806,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie szyfru %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -868,11 +880,6 @@ msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nie mo�na wykona� %s ,,%s'': %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "nie mo�na utworzy� ,,%s'': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1167,7 +1174,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
@@ -1175,7 +1182,7 @@ msgstr "Symetryczne: "
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Kompresji: "
 
@@ -1308,7 +1315,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
@@ -2444,29 +2451,29 @@ msgstr "[uniewa�nienie]"
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
@@ -2521,12 +2528,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
@@ -2726,7 +2733,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3080,241 +3087,241 @@ msgstr "foto"
 msgid "show photo ID"
 msgstr "okazanie identyfikatora - zdj�cia"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego '%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane klucze? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten klucz? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ustawienie opcji klucza"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno usaktualni� ustawienia? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (poufne)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " zaufanie: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "data"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3322,7 +3329,7 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3331,7 +3338,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3340,45 +3347,45 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3388,162 +3395,162 @@ msgstr ""
 "             uniewa�niaj�cego, spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� tylko jeden podklucz.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, 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:3495
+#: g10/keyedit.c:3499
 #, 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:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o numerze %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Identyfikator u�ytkownika: "
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez %08lX w %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, 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"
@@ -4057,107 +4064,107 @@ msgstr ""
 msgid "never     "
 msgstr "nigdy     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Krytyczny regulamin podpisu: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Regulamin podpisu: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZE�ENIE: niepoprawne dane w adnotacji\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Krytyczne adnotacje podpisu: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Adnotacje podpisu: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Zbi�r kluczy"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [wygasa :%s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "      Odcisk podklucza:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza g��wnego:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Odcisk klucza ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "sprawdzanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy (%lu podpis�w)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
@@ -4280,11 +4287,6 @@ msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4716,7 +4718,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem agenta: zwr�ci� 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4793,23 +4796,23 @@ msgstr "Czy zdj�cie jest w porz�dku? (t/N/w) "
 msgid "unable to display photo ID!\n"
 msgstr "nie mo�na wy�wietli� zdj�cia!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "nie podano przyczyny"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "klucz zosta� zast�piony"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "klucz zosta� skompromitowany"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "klucz nie jest ju� u�ywany"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "identyfikator u�ytkownika przesta� by� poprawny"
 
@@ -4880,7 +4883,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
@@ -5036,8 +5039,8 @@ msgid "skipped: public key already set\n"
 msgstr "pomini�ty: zosta� ju� wybrany w innej opcji\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "nieznany domy�lny adresat ,,%s''\n"
 
 #: g10/pkclist.c:948
@@ -5067,15 +5070,15 @@ msgstr "Podpis oddzielony od danych.\n"
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
@@ -5113,7 +5116,7 @@ msgid "NOTE: key has been revoked"
 msgstr "UWAGA: klucz zosta� uniewa�niony"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
@@ -5123,65 +5126,65 @@ msgstr "wywo�anie funkcji build_packet nie powiod�o si�: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Zostanie uniewa�niony przez:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(to jest czu�y klucz uniewazniaj�cy)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "wymuszono opakowanie ASCII wyniku.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "wywo�anie funkcji make_keysig_packet nie powiod�o si�: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Certyfikat uniewa�nienia zosta� utworzony.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "brak kluczy uniewa�niaj�cych dla ,,%s''\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "klucz prywatny ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "brak odpowiadaj�cego klucza publicznego: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "klucz publiczny nie pasuje do klucza prywatngeo!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego klucza? (t/N) "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "nieznany algorytm ochrony\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "UWAGA: Ten klucz nie jest chroniony!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5205,33 +5208,33 @@ msgstr ""
 "komputer�w mog� zachowa� tre�� wydruku i udost�pni� j� osobom "
 "nieupowa�nionym.\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Prosz� wybra� pow�d uniewa�nienia:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Prawdopodobnie chcesz tu wybra� %d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Wprowad� opis (nieobowi�zkowy) i zako�cz go pust� lini�:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Pow�d uniewa�nienia: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(nie podano)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Informacje poprawne? "
@@ -5408,60 +5411,53 @@ msgstr ""
 "kluczami PGP 2 w trybie --pgp2 mo�na podpisywa� tylko do oddzielonych "
 "podpis�w\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "wymuszone u�ycie skr�tu %s (%d) k��ci si� z ustawieniami adresata\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "nie mo�na otworzy� pliku: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 mo�na podpisywa� tylko za pomoc� kluczy z wersji 2.x\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "zostanie u�yty szyfr %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "klucz nie jest oznaczony jako niepewny - nie mo�na go u�y� z atrap� \n"
 "generatora liczb losowych!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "pomini�ty ,,%s'': duplikat\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "pomini�ty ,,%s'': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "pomini�ty: klucz prywatny jest ju� wpisany\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "pomini�ty ,,%s'': wygenerowany przez PGP klucz dla algorytmu ElGamala,\n"
 "podpisy sk�adane tym kluczem nie zapewniaj� bezpiecze�stwa!\n"
@@ -6091,6 +6087,20 @@ msgstr "bez zabezpieczenia pami�ci nie mo�na wykona� tej operacji\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(prawdopodobnie u�ywany program jest niew�a�ciwy dlatego zadania)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "niestety, to nie dzia�a w trybie wsadowym\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "nie mo�na otworzy� pliku: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                        alias \""
diff --git a/po/pt.po b/po/pt.po
index 4233edc68..ef4e2fe28 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -38,9 +38,10 @@ msgstr "nenhum m�dulo de recolha de entropia detectado\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -73,8 +74,9 @@ msgstr "imposs�vel ler `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
@@ -296,9 +298,10 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
-msgid "sorry, can't do this in batch mode\n"
+msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -473,7 +476,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -632,11 +635,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
@@ -645,7 +644,17 @@ msgstr "Comando> "
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "comandos em conflito\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "a escrever chave privada para `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -672,8 +681,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -682,13 +691,14 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
@@ -698,7 +708,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(a n�o ser que escolha a chave pela sua impress�o digital)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interactivo sem utilizar \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -729,7 +740,7 @@ msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "utilize a op��o \"--delete-secret-keys\" para a apagar primeiro.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -776,7 +787,7 @@ msgid ""
 msgstr ""
 "ao for�ar a cifra sim�trica %s (%d) viola as prefer�ncias do destinat�rio\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -850,11 +861,6 @@ msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "imposs�vel criar `%s': %s\n"
-
 #: g10/exec.c:521
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
@@ -1153,7 +1159,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -1161,7 +1167,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compress�o: "
 
@@ -1282,7 +1288,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
@@ -2423,29 +2429,29 @@ msgstr "[revoga��o]"
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorrecta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorrectas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
@@ -2499,12 +2505,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
@@ -2706,7 +2712,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3059,241 +3065,241 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 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:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3301,13 +3307,13 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3316,46 +3322,46 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3364,161 +3370,161 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 #, 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, 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:3495
+#: g10/keyedit.c:3499
 #, 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:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4027,107 +4033,107 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Politica de assinatura cr�tica: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Politica de assinatura: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Nota��o de assinatura cr�tica: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[expira: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr "Impress�o da chave prim�ria:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Impress�o da subchave:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impress�o da chave ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
@@ -4250,11 +4256,6 @@ msgstr "A gera��o de chaves falhou: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "chave `%s' n�o encontrada: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4691,7 +4692,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4765,23 +4767,23 @@ msgstr "Est� correto (s/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "A chave foi substitu�da"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "A chave foi comprometida"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "A chave j� n�o � utilizada"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "O identificador do utilizador j� n�o � v�lido"
 
@@ -4852,7 +4854,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Decis�o? "
 
@@ -5010,8 +5012,8 @@ msgid "skipped: public key already set\n"
 msgstr "ignorado: a chave p�blica j� est� presente\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5040,15 +5042,15 @@ msgstr "Assinatura separada.\n"
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -5086,7 +5088,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
@@ -5096,68 +5098,68 @@ msgstr "actualiza��o falhou: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/revoke.c:375
+#: g10/revoke.c:376
 #, c-format
-msgid "no revocation keys found for `%s'\n"
+msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:429
+#: g10/revoke.c:432
 #, fuzzy, c-format
-msgid "secret key `%s' not found: %s\n"
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr ""
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5168,37 +5170,37 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 #, fuzzy
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "\n"
 "Insira o identificador do utilizador. Termine com uma linha vazia: "
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usar esta chave de qualquer modo? "
@@ -5370,12 +5372,12 @@ msgstr "assinatura %s de: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar-desligar com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5383,48 +5385,41 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "a assinar:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "imposs�vel abrir %s: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "s� pode assinar � vista com chaves do tipo PGP 2.x no modo --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "ser� utilizada a cifragem %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada insegura - imposs�vel us�-la com o RNG falso!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicada\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
@@ -6058,6 +6053,21 @@ 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 "sorry, can't do this in batch mode\n"
+#~ msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "chave `%s' n�o encontrada: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "imposs�vel criar `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "imposs�vel abrir %s: %s\n"
+
+#, fuzzy
 #~ msgid "          \""
 #~ msgstr "                   ou \""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9c1c79a11..e13516561 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -42,9 +42,10 @@ msgstr ""
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -77,8 +78,9 @@ msgstr "imposs�vel abrir `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -301,9 +303,10 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
 #, fuzzy
-msgid "sorry, can't do this in batch mode\n"
+msgid "can't do this in batch mode\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -479,7 +482,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
@@ -639,11 +642,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comando> "
 
@@ -652,8 +651,18 @@ msgstr "Comando> "
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "comandos conflitantes\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "escrevendo certificado privado para `%s'\n"
+
 # help ou ajuda ???
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -681,8 +690,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -691,13 +700,14 @@ msgstr "imposs�vel abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
 #, fuzzy, c-format
-msgid "key `%s' not found: %s\n"
+msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -707,7 +717,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr ""
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "imposs�vel fazer isso em modo n�o-interativo sem \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -739,7 +750,7 @@ msgstr "h� uma chave secreta para esta chave p�blica!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "use a op��o \"--delete-secret-key\" para delet�-la antes.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -783,7 +794,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -856,11 +867,6 @@ msgstr "imposs�vel abrir %s: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "imposs�vel criar %s: %s\n"
-
 #: g10/exec.c:521
 #, fuzzy, c-format
 msgid "system error while calling external program: %s\n"
@@ -1162,7 +1168,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr ""
 
@@ -1170,7 +1176,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
@@ -1290,7 +1296,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
@@ -2384,29 +2390,29 @@ msgstr "[revoga��o]"
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o verificada devido a um erro\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas devido a erros\n"
@@ -2466,13 +2472,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 #, 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -2653,7 +2659,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3023,463 +3029,463 @@ msgstr ""
 msgid "show photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1347
 #, fuzzy, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 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:1547
+#: g10/keyedit.c:1551
 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:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key "
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 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:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, 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:3495
+#: g10/keyedit.c:3499
 #, 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:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 #, 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:3737
+#: g10/keyedit.c:3741
 #, 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:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -3993,115 +3999,115 @@ msgstr ""
 msgid "never     "
 msgstr ""
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 #, fuzzy
 msgid "Critical signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 #, fuzzy
 msgid "Signature policy: "
 msgstr "assinatura %s de: %s\n"
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de nota��o inv�lidos encontrados\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 #, fuzzy
 msgid "Critical signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 #, fuzzy
 msgid "Signature notation: "
 msgstr "Nota��o: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr ""
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "A chave expira em %s\n"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 #, fuzzy
 msgid "     Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "       Impress�o digital:"
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
@@ -4224,11 +4230,6 @@ msgstr "enumera��o de chaves secretas falhou: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "usu�rio `%s' n�o encontrado: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4669,7 +4670,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4743,25 +4745,25 @@ msgstr "Est� correto (s/n)? "
 msgid "unable to display photo ID!\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr ""
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 #, fuzzy
 msgid "Key is superseded"
 msgstr "A chave � protegida.\n"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 #, fuzzy
 msgid "Key has been compromised"
 msgstr "Esta chave foi desativada"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr ""
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr ""
 
@@ -4834,7 +4836,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
@@ -4991,8 +4993,8 @@ msgid "skipped: public key already set\n"
 msgstr "%s: ignorado: a chave p�blica j� est� presente\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5021,16 +5023,16 @@ msgstr "Assinatura separada.\n"
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
@@ -5069,7 +5071,7 @@ msgid "NOTE: key has been revoked"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, fuzzy, c-format
 msgid "build_packet failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
@@ -5079,69 +5081,69 @@ msgstr "atualiza��o falhou: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr ""
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr ""
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr ""
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, fuzzy, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 #, fuzzy
 msgid "Revocation certificate created.\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/revoke.c:375
+#: g10/revoke.c:376
 #, c-format
-msgid "no revocation keys found for `%s'\n"
+msgid "no revocation keys found for \"%s\"\n"
 msgstr ""
 
-#: g10/revoke.c:429
+#: g10/revoke.c:432
 #, fuzzy, c-format
-msgid "secret key `%s' not found: %s\n"
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, fuzzy, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 #, fuzzy
 msgid "public key does not match secret key!\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 #, fuzzy
 msgid "unknown protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 #, fuzzy
 msgid "NOTE: This key is not protected!\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5152,34 +5154,34 @@ msgid ""
 "your machine might store the data and make it available to others!\n"
 msgstr ""
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 #, fuzzy
 msgid "Please select the reason for the revocation:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr ""
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr ""
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, fuzzy, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr ""
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Usa esta chave de qualquer modo? "
@@ -5341,61 +5343,54 @@ msgstr "assinatura %s de: %s\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "imposs�vel abrir arquivo: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, fuzzy, c-format
 msgid "%s encryption will be used\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "a chave n�o est� marcada como insegura - imposs�vel us�-la com o pseudo "
 "RNG!\n"
 
-#: g10/skclist.c:157
+#: g10/skclist.c:158
 #, fuzzy, c-format
-msgid "skipped `%s': duplicated\n"
+msgid "skipped \"%s\": duplicated\n"
 msgstr "ignorado `%s': duplicado\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 #, fuzzy
 msgid "skipped: secret key already present\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "ignorado `%s': esta � uma chave ElGamal gerada pelo PGP que n�o � segura "
 "para assinaturas!\n"
@@ -6034,6 +6029,22 @@ 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 "sorry, can't do this in batch mode\n"
+#~ msgstr "imposs�vel fazer isso em modo n�o-interativo\n"
+
+#, fuzzy
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "usu�rio `%s' n�o encontrado: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "imposs�vel criar %s: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "imposs�vel abrir arquivo: %s\n"
+
+#, fuzzy
 #~ msgid "          \""
 #~ msgstr "                   ou \""
 
diff --git a/po/ro.po b/po/ro.po
index a27dfa95a..a3f98ccc1 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-06-17 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -39,9 +39,10 @@ msgstr "nu a fost g�sit nici un modul de adunare a entropiei\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -75,8 +76,9 @@ msgstr "nu pot citi `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
@@ -303,9 +305,11 @@ msgstr "cheia secret� nu e disponibil�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "nu pot face acest lucru �n modul batch\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -479,7 +483,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
@@ -638,11 +642,7 @@ msgstr "parola"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "nu pot face acest lucru �n modul batch\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Comand�> "
 
@@ -651,7 +651,17 @@ msgstr "Comand�> "
 msgid "Admin-only command\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "comenzi �n conflict\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "scriu cheia secret� �n `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -678,8 +688,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -688,13 +698,14 @@ msgstr "nu pot deschide `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "cheia `%s' nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "eroare la citire keyblock: %s\n"
@@ -704,7 +715,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(dac� nu specifica�i cheia prin amprent�)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "nu se poate face acest lucru �n mod batch f�r� \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -737,7 +749,7 @@ msgstr ""
 "folosi�i op�iunea \"--delete-secret-keys\" pentru a o �terge pe aceasta mai "
 "�nt�i.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
@@ -783,7 +795,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "for��nd cifrul simetric %s (%d) viola�i preferin�ele destinatarului\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -859,11 +871,6 @@ msgstr "nu pot executa %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nu pot executa %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "nu pot crea `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1157,7 +1164,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Cifru: "
 
@@ -1165,7 +1172,7 @@ msgstr "Cifru: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Compresie: "
 
@@ -1298,7 +1305,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nu este un set de carectere valid\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URI pentru serverul de chei\n"
@@ -2445,29 +2452,29 @@ msgstr "[revocare]"
 msgid "[self-signature]"
 msgstr "[auto-semn�tur�]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 semn�tur� incorect�\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d semn�turi incorecte\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 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:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d semn�turi nu au fost verificate din cauza unor erori\n"
@@ -2521,12 +2528,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
@@ -2729,7 +2736,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i?"
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3082,242 +3089,242 @@ msgstr "afispoza"
 msgid "show photo ID"
 msgstr "arat� o poz� ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 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:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i cheile selectate? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� cheie? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "seteaz� lista de preferin�e"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 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? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Aceast� cheie poate fi revocat� de cheia %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nu pot crea %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocat�] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [expir�: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [expir�: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �ncredere: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �ncredere: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revocat�] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expira"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3325,7 +3332,7 @@ msgstr ""
 "V� rug�m observa�i c� validitatea cheii ar�tate nu este �n mod necesar\n"
 "corect� dac� nu reporni�i programul.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3334,7 +3341,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3343,45 +3350,45 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�tur�.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3391,34 +3398,34 @@ msgstr ""
 "revocator          desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTISMENT: Aceast� cheie a fost revocat� revocatorul desemnat!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3426,129 +3433,129 @@ msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i revocator "
 "desemnat? (d/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "V� rug�m selecta�i cel mult o cheie secundar�.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie secundar�.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimbarea timpului de expirare pentru o cheie primar�.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�turi v3 s�rite pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i (d/N)? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nici o cheie secundar� cu indicele %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   semnat� de %08lX la %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat de %08lX la %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 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:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia 0x%08lX (uid %d)\n"
@@ -4056,107 +4063,107 @@ msgstr ""
 msgid "never     "
 msgstr "niciodat�     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Politic� de semn�turi critic�: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Politic� de semn�turi: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTISMENT: am g�sit date de notare invalide\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Notare semn�tur� critic�: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [expir�: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Amprent� cheie primar�:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Amprent� subcheie:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Amprent� cheie primar�:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Amprent� subcheie:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Amprent� cheie ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "verific inelul de chei `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei verificate (%lu semn�turi)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei verificate (%lu semn�turi)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
@@ -4280,11 +4287,6 @@ msgstr "recep�ie server de chei e�uat�: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "cheia `%s' nu a fost g�sit�: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4719,7 +4721,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "nu pot cere parola �n modul batch\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4798,23 +4801,23 @@ msgstr "Este aceast� poz� corect� (d/N/t)? "
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afi�a poza ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Nici un motiv specificat"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Cheia este �nlocuit�"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Cheia a fost compromis�"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Cheia nu mai este folosit�"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "ID utilizator nu mai este valid"
 
@@ -4885,7 +4888,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Decizia d-voastr�? "
 
@@ -5045,8 +5048,8 @@ msgid "skipped: public key already set\n"
 msgstr "s�rit�: cheia public� setat� deja\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "destinatar implicit necunoscut `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5076,15 +5079,15 @@ msgstr "Semn�tur� deta�at�.\n"
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
@@ -5122,7 +5125,7 @@ msgid "NOTE: key has been revoked"
 msgstr "NOT�: cheia a fost revocat�"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet a e�uat: %s\n"
@@ -5132,65 +5135,65 @@ msgstr "build_packet a e�uat: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "cheia %08lX: nici un ID utilizator\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Pentru a fi revocat de:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Aceasta este o cheie de revocare senzitiv�)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Ie�ire �n armur� ASCII for�at�.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet a e�uat: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "nici o cheie de revocare g�sit� pentru `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "cheia secret� `%s' nu a fost g�sit�: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "nici o cheie public� corespunz�toare: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "cheia public� nu se potrive�te cu cheia secret�!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� cheie? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "algoritm de protec�ie necunoscut\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "NOT�: Aceast� cheie nu este protejat�!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5208,33 +5211,33 @@ msgstr ""
 "caz c� mediumul este deteriorat.  Dar fi�i atent: sistemul de tip�rire al\n"
 "ma�inii d-voastr� ar putea p�stra datele �i s� le fac� accesibile altora!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "V� rug�m selecta�i motivul pentru revocare:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Renun��"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Probabil dori�i s� selecta�i %d aici)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Introduce�i o descriere op�ional�; termina�i cu o linie goal�:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Motiv pentru revocare: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Este aceasta OK? "
@@ -5405,59 +5408,52 @@ msgstr "%s semn�tur� de la: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-data�at cu chei stil PGP 2.x numai �n modul --pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "for�area algoritmului rezumat %s (%d) violeaz� preferin�ele destinatarului\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "semnare:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "nu pot deschide fi�ierul: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "pute�i semna-�n-clar cu chei stil PGP 2.x �n modul --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "va fi folosit� cifrarea %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "cheia nu este marcat� ca sigur� - nu o pot folosi cu GNA falsificat!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "s�rit� `%s': duplicat�\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "s�rit� `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "s�rit�: cheia secret� deja prezent�\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "s�rit� `%s': aceasta este o cheie ElGamal generat� de PGP care nu e sigur� "
 "pentru semn�turi!\n"
@@ -6086,6 +6082,20 @@ 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 "sorry, can't do this in batch mode\n"
+#~ msgstr "�mi pare r�u, nu pot face acest lucru �n modul batch\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "cheia `%s' nu a fost g�sit�: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "nu pot crea `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "nu pot deschide fi�ierul: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                aka \""
diff --git a/po/ru.po b/po/ru.po
index 25e076eee..07385d88b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2003-12-23 19:24+0100\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -36,9 +36,10 @@ msgstr "не найден модуль накопления энтропии\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -70,8 +71,9 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
@@ -297,9 +299,11 @@ msgstr "секретный ключ не найден"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "извините, но это невозможно выполнить в пакетном режиме\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "не могу делать это в пакетном режиме\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -473,7 +477,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
@@ -632,11 +636,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "не могу делать это в пакетном режиме\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Команда> "
 
@@ -645,7 +645,17 @@ msgstr "Команда> "
 msgid "Admin-only command\n"
 msgstr "несовместимые команды\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "несовместимые команды\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "сохранение секретного ключа в `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -672,8 +682,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -682,13 +692,14 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "ключ `%s' не найден: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "ошибка чтения блока ключей: %s\n"
@@ -698,7 +709,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(если только Вы не задали ключ отпечатком)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "не могу выполнять в пакетном режиме без \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -729,7 +741,7 @@ msgstr "имеется секретный ключ для открытого к�
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "сначала используйте опцию \"--delete-secret-keys\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при создании ключевой фразы (пароля): %s\n"
@@ -773,7 +785,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "использование шифра %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -846,11 +858,6 @@ msgstr "не могу запустить %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "не могу запустить %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "не могу создать `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1147,7 +1154,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
@@ -1155,7 +1162,7 @@ msgstr "Симметричные шифры: "
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
@@ -1275,7 +1282,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s недопустимая таблица символов\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URI сервера ключей\n"
@@ -2404,29 +2411,29 @@ msgstr "[отозван]"
 msgid "[self-signature]"
 msgstr "[самоподпись]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 плохая подпись\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d плохих подписей\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 подпись не проверена за отсутствием ключа\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d подписей не проверено за отсутствием ключей\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 подпись не проверена из-за ошибки\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d подписей не проверено из-за ошибок\n"
@@ -2480,12 +2487,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите это подписать? (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
@@ -2686,7 +2693,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3039,240 +3046,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "показать фото ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Вы действительно хотите подписать ВСЕ User ID? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Подсказка: Выберите User IDs для подписи\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Вы должны выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить последний User ID!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вы действительно хотите удалить ВСЕ выбранные User IDs? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Вы действительно хотите удалить данный User ID? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы действительно хотите удалить выбранные ключи? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы действительно хотите удалить данный ключ? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Вы действительно хотите отозвать выбранные ключи? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Вы действительно хотите отозвать данный ключ? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "установить предпочтения"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Данный ключ может быть отозван ключом %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "не могу создать %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [годен до: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " доверие: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[отозван]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3280,7 +3287,7 @@ msgstr ""
 "Заметьте, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3288,7 +3295,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID отмеченного как главный.  Данная команда может\n"
 "              использовать другой User ID в качестве главного.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3297,45 +3304,45 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Вы можете не добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3344,159 +3351,159 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Вы не можете добавить назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить PGP 2.x ключ, как назначенный отзывающим\n"
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ВНИМАНИЕ: Данный ключ отозван отзывающим ключом!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим не возможно будет отменить!\n"
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Выделите не более одного вторичного ключа.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Смена срока действия вторичного ключа.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Вы не можете изменить срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы действительно хотите использовать его? (y/N)"
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Нет вторичного ключа с индексом %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   подписан %08lX  %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок подписи закончился %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   отозван %08lX  %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа 0x%08lX (uid %d)\n"
@@ -4001,107 +4008,107 @@ msgstr ""
 msgid "never     "
 msgstr "никогда   "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Критические правила для подписи: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Правила для подписи: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "ВНИМАНИЕ: найдена недопустимая форма записи данных\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Критическое примечание к подписи: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Примечание к подписи"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "нечитаемо для человека"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [годен до: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток главного ключа:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "         Отпечаток подключа:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Отпечаток ключа ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "проверка таблицы ключей `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей проверено (%lu подписей)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей проверено (%lu подписей)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
@@ -4224,11 +4231,6 @@ msgstr "неудача при получении с сервера ключей:
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "ключ `%s' не найден: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4658,7 +4660,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "проблема с агентом: агент вернул 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "не могу получить пароль в пакетном режиме\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4735,23 +4738,23 @@ msgstr "Данное фото правильное (y/N/q)? "
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить Фото ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Без указания причины"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Ключ заменён другим"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Ключ был скомпрометирован"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Ключ больше не используется"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "User ID больше не действителен"
 
@@ -4822,7 +4825,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Ваше решение (?-подробнее)? "
 
@@ -4973,8 +4976,8 @@ msgid "skipped: public key already set\n"
 msgstr "пропущено: открытый ключ уже установлен\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "неизвестный получатель по умолчанию `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5003,15 +5006,15 @@ msgstr "Отделенная подпись.\n"
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "нет подписанных данных\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
@@ -5049,7 +5052,7 @@ msgid "NOTE: key has been revoked"
 msgstr "ЗАМЕТЬТЕ: ключ был отозван"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet failed: %s\n"
@@ -5059,65 +5062,65 @@ msgstr "build_packet failed: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "ключ %08lX: не имеет User ID\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Будет отозван:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Это отзывающий ключ с sensitive)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/n)"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Для вывода использован ASCII формат.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet failed: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Сертификат отзыва создан.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "ключи отзыва для `%s' не найдены\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "секретный ключ `%s' не найден: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "нет соотвествующего открытого ключа: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "открытый ключ не соотвествует секретному!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Создать сертификат отзыва данного ключа? (y/n)"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "неизвестный алгоритм защиты\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "ЗАМЕЧАНИЕ: Данный ключ не защищен!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5136,33 +5139,33 @@ msgstr ""
 "носитель будет повреждён, но будьте осторожны: система печати\n"
 "Вашей машины может сохранить данные и сделать их доступными для других!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Выберите причину отзыва:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Отмена"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Возможно Вы хотите выбрать здесь %d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Введите необязательное пояснение; закончите пустой строкой:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Причина отзыва: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Пояснения отсутствуют)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Все правильно? "
@@ -5325,59 +5328,52 @@ msgstr "%s подпись от: \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только отделенная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "использование хэш-функции %s (%d) нарушает предпочтения получателя\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "подписывание:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "не могу открыть файл: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "только прозрачная подпись доступна с PGP 2.x ключом в режиме --pgp2\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "будет использовано %s шифрование\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "ключ не помечен как ненадежный - не могу использовать его с ненадёжным RNG!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "пропущено `%s': дубликат\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "пропущено `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "пропущено: секретный ключ уже имеется\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "пропущено `%s': это созданный PGP - ElGamal ключ, не обеспечивающий\n"
 "безопасность подписи\n"
@@ -6007,6 +6003,20 @@ msgstr ""
 "(возможно, Вы используете неподходящее программное обеспечение\n"
 "для данной задачи)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "извините, но это невозможно выполнить в пакетном режиме\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "ключ `%s' не найден: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "не могу создать `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "не могу открыть файл: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                aka \""
diff --git a/po/sk.po b/po/sk.po
index 4388c7c4f..9791e12bc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+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"
@@ -34,9 +34,10 @@ msgstr "nebol detekovan� �iadny modul na z�skanie entropie\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -68,8 +69,9 @@ msgstr "nem��em ��ta� `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
@@ -293,8 +295,10 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
 msgstr "nemo�no previes� v d�vkovom m�de\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -469,7 +473,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
@@ -628,11 +632,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "nemo�no previes� v d�vkovom m�de\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Pr�kaz> "
 
@@ -641,7 +641,17 @@ msgstr "Pr�kaz> "
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "konfliktn� pr�kazy\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "zapisujem tajn� k��� do `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -668,8 +678,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -678,13 +688,14 @@ msgstr "nemo�no otvori� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
@@ -694,7 +705,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(pokia� neur��te k��� jeho fingerprintom)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "bez parametra \"--yes\" to nemo�no v d�vkovom m�de previes�\n"
 
 #: g10/delkey.c:139
@@ -725,7 +737,7 @@ msgstr "existuje tajn� k��� pre tento verejn� k��� \"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "aby ste ho zmazali, pou�ite najprv prep�na� \"--delete-secret-key\".\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -770,7 +782,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "vy�iadan� symetrick� �ifra %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -847,11 +859,6 @@ msgstr "nemo�no spusti� %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "nemo�no spusti� %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "nem��em vytvori� `%s': %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1152,7 +1159,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�ifry: "
 
@@ -1160,7 +1167,7 @@ msgstr "�ifry: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Kompresia: "
 
@@ -1284,7 +1291,7 @@ msgstr ""
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
@@ -2429,29 +2436,29 @@ msgstr "[revok�cia]"
 msgid "[self-signature]"
 msgstr "[podpis k���a n�m sam�m]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 zl� podpis\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d zl�ch podpisov\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis neoveren�, preto�e ch�ba k���\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis neoveren�, preto�e vznikla chyba\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpisov neoveren�ch, preto�e vznikli chyby\n"
@@ -2506,12 +2513,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 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:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
@@ -2714,7 +2721,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3067,240 +3074,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, 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:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3308,7 +3315,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3316,7 +3323,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3325,45 +3332,45 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3372,159 +3379,159 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, 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:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, 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:3050
+#: g10/keyedit.c:3054
 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:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 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:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, 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:3495
+#: g10/keyedit.c:3499
 #, 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:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Neexistuje sekund�rny k��� s indexom %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4033,107 +4040,107 @@ msgstr ""
 msgid "never     "
 msgstr "nikdy     "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kritick� podpisov� politika: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Podpisov� politika: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVANIE: n�jden� neplatn� form�t z�pisu d�tumu\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kritick� podpisov� not�cia: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "s�bor k���ov (keyring)"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "     Fingerprint podk���a:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " Prim�rny fingerprint k���a:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podk���a:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint k���a ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
@@ -4256,11 +4263,6 @@ msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "k��� `%s' nebol n�jden�: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4698,7 +4700,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "v d�vkovom re�ime sa nem��em p�ta� na heslo\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4776,23 +4779,23 @@ msgstr "Je t�to fotografia spr�vna (a/N/u)? "
 msgid "unable to display photo ID!\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "K��� je nahraden�"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "K��� bol skompromitovan�"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "K��� sa u� nepou��va"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Identifik�tor u��vate�a u� neplat�"
 
@@ -4863,7 +4866,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Va�e rozhodnutie? "
 
@@ -5019,8 +5022,8 @@ msgid "skipped: public key already set\n"
 msgstr "presko�en�: verejn� k��� je u� nastaven�\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
 #: g10/pkclist.c:948
@@ -5049,15 +5052,15 @@ msgstr "Podpis oddelen� od dokumentu.\n"
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
@@ -5095,7 +5098,7 @@ msgid "NOTE: key has been revoked"
 msgstr "POZN�MKA: k��� bol revokovan�"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet zlyhala: %s\n"
@@ -5105,65 +5108,65 @@ msgstr "build_packet zlyhala: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Bude revokovan�:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Toto je citliv� revoka�n� k���)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "Vyn�ten� ASCII textov� v�stup.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet zlyhala: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Revoka�n� certifik�t bol vytvoren�.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "�iadne revoka�n� k���e pre `%s' nen�jden�\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "tajn� k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "POZN�MKA: Tento k��� nie je chr�nen�!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5181,33 +5184,33 @@ msgstr ""
 "Ale hroz� nebezpe�enstvo: Tla�ov� syst�m V�ho po��ta�a m��e uklada� d�ta a\n"
 "spr�stupni� ich in�m!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Zru�i�"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Pravdepodobne ste chceli vybra� %d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Ak chcete, nap��te popis; ukon�ite pr�zdnym riadkom:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "D�vod na revok�ciu: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(�iadny popis)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Je to v poriadku? "
@@ -5377,63 +5380,56 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytvori� len oddelen� podpis k���a vo form�te PGP-2.x\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "podpisujem:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "nemo�no otvori� s�bor: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� �itate�n� podpisy len s k���mi form�tu PGP-2."
 "x\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "bude pou�it� �ifrovanie %s\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "k��� nie je ozna�en� ako nedostato�ne bezpe�n� - nem��em ho pou�i� s "
 "falo�n�m RNG!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "presko�en� `%s': duplikovan�\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "presko�en� `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "presko�en� `%s': toto je vygenerovan� PGP k��� pod�a algoritmu ElGamal,\n"
 "podpisy vytvoren� t�mto k���om nie s� bezpe�n�!\n"
@@ -6064,6 +6060,20 @@ msgstr "vykonanie oper�cie nie je mo�n� bez inicializovanej bezpe�nej pam�te\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(pravdepodobne ste na t�to �lohu pou�ili nespr�vny program)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "nemo�no previes� v d�vkovom m�de\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "k��� `%s' nebol n�jden�: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "nem��em vytvori� `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "nemo�no otvori� s�bor: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                alias \""
diff --git a/po/sv.po b/po/sv.po
index a852fb719..f9fce5c90 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-09-20 22:12+0100\n"
 "Last-Translator: Per Tunedal <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -55,9 +55,10 @@ msgstr "ingen demon för entropisamling hittad\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -89,8 +90,9 @@ msgstr "kan inte läsa \"%s\": %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "notera: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
@@ -319,8 +321,10 @@ msgstr "den hemliga nyckeln är inte tillgänglig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
 msgstr "kan inte göra detta i batch-läge\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
@@ -494,7 +498,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Felaktigt val.\n"
 
@@ -656,11 +660,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "kan inte göra detta i batch-läge\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Kommando> "
 
@@ -669,7 +669,17 @@ msgstr "Kommando> "
 msgid "Admin-only command\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "motstridiga kommandon\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "skriver hemlig nyckel till \"%s\"\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (försök med \"help\")\n"
 
@@ -697,8 +707,8 @@ msgid "Enter PIN: "
 msgstr ""
 
 # se förra kommentaren
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -707,13 +717,14 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "fel vid läsninga av  nyckelblock: %s\n"
@@ -723,7 +734,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(om du inte anger nyckeln med hjälp av fingeravtrycket)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "kan inte göra så i batch-läge utan flaggan \"--yes\"\n"
 
 #: g10/delkey.c:139
@@ -754,7 +766,7 @@ msgstr "det finns en hemlig nyckel tillhörande denna öppna nyckel!\"%s\"!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "använd flaggan \"--delete-secret-keys\"för att ta bort den först.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel vid skapandet av lösenmening: %s\n"
@@ -802,7 +814,7 @@ msgstr ""
 "att kräva symetrisk kryptering med %s (%d) strider mot mottagarnas "
 "inställningar\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -881,11 +893,6 @@ msgstr "Kunde inte köra %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "Kunde inte köra %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "kan inte skapa \"%s\": %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1181,7 +1188,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "öppen nyckel:"
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Chiffer"
 
@@ -1189,7 +1196,7 @@ msgstr "Chiffer"
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Komprimering:"
 
@@ -1309,7 +1316,7 @@ msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
@@ -2492,29 +2499,29 @@ msgstr "[spärrad]"
 msgid "[self-signature]"
 msgstr "[egensignatur]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 felaktig signatur\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d felaktiga signaturer\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 signatur verifierades inte eftersom nyckeln saknades\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signaturer verifierades inte eftersom nycklar saknades\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 signatur verifierades inte eftersom ett fel uppstod\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signaturer verifierades inte eftersom fel uppstod\n"
@@ -2569,12 +2576,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Användar-ID \"%s\" är spärrat."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
@@ -2782,7 +2789,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vill du verkligen signera? "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3138,242 +3145,242 @@ msgstr "visa bild"
 msgid "show photo ID"
 msgstr "visa bild-ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemlig nyckel\"%s\": %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vill du verkligen signera alla användaridentiteter? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj det användarid du vill signera\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, 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:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vill du verkligen ta bort alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vill du verkligen ta bort denna användaridentitet? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort valda nycklar? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vill du verkligen spärra alla valda användaridentiteter? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vill du verkligen spärra denna användaridentitet? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Vill du verkligen spärra de valda nycklarna? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Vill du verkligen spärra denna nyckel? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ange inställningslista"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, 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:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen ändra inställningarna?"
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringarna? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Sammandrag:"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Funktioner:"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "Denna nyckel kan spärras av nyckeln %s"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (känsligt)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " tillit: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Denna nyckel har deaktiverats"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för ett användar-ID av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3381,7 +3388,7 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om  programmet.\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3390,7 +3397,7 @@ msgstr ""
 "Detta kommando kan göra att ett annat användar-ID antas\n"
 "vara huvudidentitet.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3400,46 +3407,46 @@ msgstr ""
 "vissa versioner\n"
 "         av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett bild-ID till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Vill du verkligen radera denna egensignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3448,33 +3455,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:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användar-ID för spärrnyckeln:"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VARNING: Denna nyckel har spärrats av sin spärrnyckel!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3482,133 +3489,133 @@ msgstr ""
 "Är du verkligen säker på att du vill utse denna nyckel till spärrnyckel? (j/"
 "N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Välj som högst en undernyckel.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Ändrar giltighetstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för huvudnyckeln.\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Du måste välja bara en användaridentitet.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, 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:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Vill du verkligen sp?rra denna nyckel? "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Vill du verkligen sp?rra denna nyckel? "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med index %d\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Ingen undernyckel med index %d\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, 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:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, 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:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   spärrad av %08lX %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du står i begrepp att återkalla dessa signaturer:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (y/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Användar-ID \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, 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"
@@ -4119,108 +4126,108 @@ msgstr ""
 msgid "never     "
 msgstr "aldrig"
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "FELAKTIG signatur fr?n \""
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "Signatur-policy: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "FELAKTIG signatur fr?n \""
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "Signatur-notering:"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "inte möjlig att läsa för människor"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[går ut: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr "Huvudnyckelns fingeravtryck:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
 # märkligt felmeddelande, kolla upp
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollerar nyckelringen `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar och %lu signaturer har kontrollerats\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
@@ -4342,11 +4349,6 @@ msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "hittade inte nyckeln  `%s': %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4792,7 +4794,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "problem med GPG-Agent: programmet svarar 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "kan inte fråga efter lösenmening i batch-läge\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4869,25 +4872,25 @@ msgstr "Är detta foto korrekt (j/N/a)? "
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-ID!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Ingen anledning har angivits"
 
 # tveksam översättning. funderar på "ersatt av något bättre" men det
 # känns inte heller bra
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Nyckeln är ersatt"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Nyckeln har tappat sin säkerhet"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Nyckeln används inte längre"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Användaridentiteten är inte längre giltig"
 
@@ -4962,7 +4965,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Vad väljer du? "
 
@@ -5120,8 +5123,8 @@ msgid "skipped: public key already set\n"
 msgstr "hoppade över: öppen nyckel redan angiven\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "den förvalda mottagaren \"%s\" är okänd\n"
 
 #: g10/pkclist.c:948
@@ -5150,16 +5153,16 @@ msgstr "Signatur i en separat fil.\n"
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, fuzzy, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -5198,7 +5201,7 @@ msgstr "OBS: nyckeln har spärrats"
 
 # Vad?
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet misslyckades: %s\n"
@@ -5208,66 +5211,66 @@ msgstr "build_packet misslyckades: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "nyckel %08lX: ingen användaridentitet\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Att spärras av:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Detta är en känslig spärrnyckel)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "utdata med ett ascii-skal valt.\n"
 
 # Vad menas???
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet misslyckades: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Spärrcertifikat skapat.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "hittade inga spärrnycklar till `%s'\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "den hemliga nyckeln `%s' hittades inte: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "ingen tillhörande öppen nyckel: %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "den öppna nyckel passar inte ihop med den hemliga nyckeln!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna nyckel?"
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "okänd krypteringsalgoritm\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "OBS: Denna nyckel är oskyddad!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5285,33 +5288,33 @@ msgstr ""
 "media blir oläsligt.  But have some caution:  The print system of\n"
 "your machine might store the data and make it available to others!\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Välj anledning till att nyckeln spärras:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Troligen vill du välja %d här)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "Skriv en frivillig beskrivning; avsluta med en tom rad:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Anledning till spärren: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(Ingen beskrivning angiven)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Är detta OK?"
@@ -5497,12 +5500,12 @@ msgstr ""
 "du kan bara skapa signaturer i en separat fil med nycklar av PGP 2.x-typ\n"
 " i --pgp2-läge\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5510,55 +5513,46 @@ msgstr ""
 "att genomdriva komprimeringsalgoritm %s (%d) strider mot mottagarens inst?"
 "llningar\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "signerar:"
 
-# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
-# fixa en patch?
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "Kan inte öppna fil %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "du kan endast krypterar till RSA nycklar som ?r h?gst 2048 bitar l?nga i --"
 "pgp2-l?ge\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "krypteringen %s kommer att användas\n"
 
 # Slumptalsgenerator: Random Number Generator
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr ""
 "nyckeln är inte markerad som osäker - det går inte att använda den med "
 "fejkad slumptalsgenerator!\n"
 
 # bubblerad?
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "hoppade över \"%s\": kopia\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över  `%s': %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "hoppade över: hemlig nyckel finns redan\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "hoppade över  `%s': detta är en nyckel av ElGamal-typ genererad av PGP\n"
 "som inte är säker för signaturer!\n"
@@ -6198,6 +6192,22 @@ msgstr "operationen är inte möjlig utan tillgång till säkert minne\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(du kan ha använt fel program för denna uppgift)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "kan inte göra detta i batch-läge\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "hittade inte nyckeln  `%s': %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "kan inte skapa \"%s\": %s\n"
+
+# Filnamn både med och utan fnuttar finns. lite ologiskt. Vill någon
+# fixa en patch?
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "Kan inte öppna fil %s\n"
+
 #~ msgid ""
 #~ "WARNING: digest `%s' is not part of OpenPGP.  Use at your own risk!\n"
 #~ msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 2e6ade0cb..340f2c056 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-07-08 08:10+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish <[email protected]>\n"
@@ -37,9 +37,10 @@ msgstr "rasgele bayt elde etme modülü bulunamadı\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -71,8 +72,9 @@ msgstr "\"%s\" okunamıyor: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
@@ -297,9 +299,11 @@ msgstr "gizli anahtar kullanışsız"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "pardon, bu betik kipinde yapılamaz\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -475,7 +479,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
@@ -634,11 +638,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "bu önceden belirlenmiş işlemler kipinde (in batchmode) yapılamaz\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "Komut> "
 
@@ -647,7 +647,17 @@ msgstr "Komut> "
 msgid "Admin-only command\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "çelişen komutlar\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "gizli anahtarı `%s'e yazıyor\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"yardım\" komutunu deneyin)\n"
 
@@ -674,8 +684,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -684,13 +694,14 @@ msgstr "`%s' açılamadı\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar `%s' yok: %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "anahtar bloğu okunurken hata: %s\n"
@@ -700,7 +711,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(anahtarı parmak izi ile belirtmedikçe)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "önceden belirlenmiş işlemler kipinde \"--yes\" olmaksızın yapılamaz\n"
 
 #: g10/delkey.c:139
@@ -731,7 +743,7 @@ msgstr "genel anahtar \"%s\" için bir gizli anahtar var!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "onu önce \"--delete-secret-keys\" ile silmelisiniz.\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
@@ -778,7 +790,7 @@ msgid ""
 msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) simetrik şifre kullanımı zorlanıyor\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -854,11 +866,6 @@ msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr " %s \"%s\" çalıştırılamıyor: %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "\"%s\" oluşturulamıyor: %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1152,7 +1159,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "Şifre: "
 
@@ -1160,7 +1167,7 @@ msgstr "Şifre: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
@@ -1279,7 +1286,7 @@ msgstr "şifre uzantısı \"%s\" güvensiz izinlerden dolayı yüklenmedi\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s geçerli bir karakter seti değil\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
@@ -2409,29 +2416,29 @@ msgstr "[yürürlükten kaldırma]"
 msgid "[self-signature]"
 msgstr "[öz-imza]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 kötü imza\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d kötü imza\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 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:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, 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:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "1 imza bir hata yüzünden kontrol edilmedi\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d imza hatalardan dolayı kontrol edilmedi\n"
@@ -2485,12 +2492,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
@@ -2691,7 +2698,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H) "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3046,243 +3053,243 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "foto kimliğini gösterir"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu `%s' okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalanacak mı? "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten iptal edilecek mi? "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "Seçilen anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "Bu anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "tercih listesi oluşturmak için"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçilen kullanıcı kimlik için tercihleri gerçekten güncellemek istiyor "
 "musunuz? "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "Özümlenen: "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr ""
 "Bu anahtar %s tarafından şu anahtarla yürürlükten kaldırılmış olabilir: "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (duyarlı)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s oluşturulamıyor: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " güvencesi: %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[yürürlükten kaldırıldı] "
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3290,7 +3297,7 @@ 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:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3299,7 +3306,7 @@ msgstr ""
 "       başka bir kullanıcı kimliğinin birincil varsayılmasına sebep "
 "olabilir.\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3308,45 +3315,45 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3356,41 +3363,41 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 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:2904
+#: g10/keyedit.c:2908
 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:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 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:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "UYARI: Bu anahtar sahibi tarafından yürürlükten kaldırılmıştı!\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 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:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -3398,130 +3405,130 @@ msgstr ""
 "bir anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 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:3109
+#: g10/keyedit.c:3113
 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:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu kullanmak istediğinizden emin misiniz? (e/H) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "%d endeksine sahip yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX ile %s%s%s de imzalanmış\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 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:3737
+#: g10/keyedit.c:3741
 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:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini imzalamışsınız:\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 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:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, 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:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4032,107 +4039,107 @@ msgstr ""
 msgid "never     "
 msgstr "asla    "
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "Kritik imza guvencesi: "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "imza guvencesi: "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: geçersiz niteleme verisi bulundu\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "Kritik imza niteleyici: "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "imza niteleyici: "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Anahtar Zinciri"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr "[son kullanma tarihi: %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr "Birincil anahtar parmak izi:"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Anahtar parmak izi ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "`%s' anahtar zinciri denetleniyor\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu anahtar denetlendi (%lu imza)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar denetlendi (%lu imza)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
@@ -4256,11 +4263,6 @@ msgstr "keyserver receive başarısızlığa uğradı: %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "anahtar `%s' yok: %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4696,7 +4698,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "vekil ile sorun var: vekil 0x%lx ile sonuçlandı\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "önceden tanımlanmış işlemler kipinde (batchmode) parola sorgulanamaz\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4775,23 +4778,23 @@ msgstr "Bu foto doğru mu? (e/H/ç)? "
 msgid "unable to display photo ID!\n"
 msgstr "foto kimliği gösterilemiyor!\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "Belirtilmiş bir neden yok"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "Anahtarın yerine başkası konulmuş ve iptal edilmiştir"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "Anahtar tehlikede"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "Anahtar artık kullanılmayacak"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "Kullanıcı kimliği artık geçersiz"
 
@@ -4862,7 +4865,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "Kararınız? "
 
@@ -5019,8 +5022,8 @@ msgid "skipped: public key already set\n"
 msgstr "atlandı: genel anahtar zaten belirtilmiş\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "öntanımlı alıcı `%s' bilinmiyor\n"
 
 #: g10/pkclist.c:948
@@ -5049,15 +5052,15 @@ msgstr "Bağımsız imza.\n"
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
@@ -5095,7 +5098,7 @@ msgid "NOTE: key has been revoked"
 msgstr "BİLGİ: anahtar yürürlükten kaldırılmıştı"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet başarısız: %s\n"
@@ -5105,65 +5108,65 @@ msgstr "build_packet başarısız: %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "anahtar %08lX: kullanıcı kimliği yok\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "Yürürlükten kaldıran:\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(Bu bir duyarlı yürürlükten kaldırma anahtarı)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "ASCII zırhlı çıktı istendi.\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet başarısız: %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "Yürürlükten kaldırma sertifikası üretildi.\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "`%s' için yürürlükten kaldırma anahtarı yok\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "gizli anahtar `%s' yok: %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "karşılığı olan genel anahtar yok: `%s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "genel anahtar gizli anahtarla uyuşmuyor!\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "bilinmeyen sıkıştırma algoritması\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "BİLGİ: Bu anahtar korunmamış!\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5181,34 +5184,34 @@ msgstr ""
 "Sertifika kısa olacağından isterseniz, bir yazıcı çıktısı olarak alıp\n"
 "bir kasada da muhafaza edebilirsiniz.\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "Lütfen bir yürürlükten kaldırma sebebi seçiniz:\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "İptal"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Burada %d seçtiğiniz varsayılıyor)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr ""
 "İsteğe bağlı açıklamayı girebilirsiniz; Boş bir satır işlemi sonlandırır:\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "Yürürlükten kaldırma sebebi: %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(açıklama verilmedi)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "Bu tamam mı? "
@@ -5380,12 +5383,12 @@ msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla ayrık imza yapabilirsiniz\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
@@ -5393,49 +5396,42 @@ msgstr ""
 "alıcının tercihleriyle çelişen %s (%d) özümleme algoritması kullanılmak "
 "isteniyor\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "imzalanıyor:"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "dosya açılamadı: %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 kipinde sadece PGP 2.x tarzı anahtarlarla açık imzalama "
 "yapabilirsiniz\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s şifrelemesi kullanılmayacak\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "anahtar güvenli olarak imlenmemiş - onu sahte RSÜ ile kullanmayın!\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' atlandı: tekrarlanmış\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "atlandı: gizli anahtar zaten var\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr ""
 "`%s' atlandı:\n"
 "Bu, imzalar için güvenli olmayan PGP üretimi bir ElGamal anahtarı!\n"
@@ -6066,6 +6062,20 @@ 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 "sorry, can't do this in batch mode\n"
+#~ msgstr "pardon, bu betik kipinde yapılamaz\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "anahtar `%s' yok: %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "\"%s\" oluşturulamıyor: %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "dosya açılamadı: %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                den \""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 134e7e418..74f778449 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2004-07-20 15:50+0200\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -36,9 +36,10 @@ msgstr "��ⲻ�������Ѽ�ģ��\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�޷��򿪡�%s���� %s\n"
@@ -70,8 +71,9 @@ msgstr "�޷���ȡ��%s����%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "ע�⣺����������ļ�δ������\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�޷�������%s����%s\n"
@@ -293,9 +295,11 @@ msgstr "˽Կ������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "��Ǹ����������ģʽ���޷���ɴ˲���\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "�ò����޷���������ģʽ�н���\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -469,7 +473,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "��Ч��ѡ��\n"
 
@@ -628,11 +632,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "�ò����޷���������ģʽ�н���\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "����> "
 
@@ -641,7 +641,17 @@ msgstr "����> "
 msgid "Admin-only command\n"
 msgstr "��ͻ��ָ��\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "��ͻ��ָ��\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "���ڽ�˽Կд��`%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "��Ч��ָ��(���ԡ�help��)\n"
 
@@ -668,8 +678,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�޷��򿪡�%s��\n"
@@ -678,13 +688,14 @@ msgstr "�޷��򿪡�%s��\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ����������������\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "�Ҳ�����%s����Կ��%s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "��ȡ��Կ����ʱ��������%s\n"
@@ -694,7 +705,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(��������ָ��ָ����Կ)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "��������ģʽ�У�û�С�--yes�����޷���ô��\n"
 
 #: g10/delkey.c:139
@@ -725,7 +737,7 @@ msgstr "��Կ��%s���ж�Ӧ��˽Կ��\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "����ʹ�á�--delete-secret-keys��ѡ����ɾ������\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "���������ʱ��������%s\n"
@@ -769,7 +781,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "ǿ��ʹ�õ� %s (%d)�ԳƼ����㷨�����ռ��ߵ���ѡ����\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -839,11 +851,6 @@ msgstr "�޷�ִ��%s��%s����%s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�޷�ִ��%s��%s����%s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "�޷�������%s����%s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1138,7 +1145,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "��Կ��"
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�ԳƼ��ܣ�"
 
@@ -1146,7 +1153,7 @@ msgstr "�ԳƼ��ܣ�"
 msgid "Hash: "
 msgstr "ɢ�У�"
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "ѹ����"
 
@@ -1265,7 +1272,7 @@ msgstr "�ԳƼ����ܷ���չģ�顰%s����ΪȨ�޲���ȫ��δ������\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ����һ����Ч���ַ���\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�޷�������Կ������ URI\n"
@@ -2379,29 +2386,29 @@ msgstr "[����]"
 msgid "[self-signature]"
 msgstr "[����ǩ��]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 ���𻵵�ǩ��\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ���𻵵�ǩ��\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�� 1 ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�� %d ��ǩ����Ϊ��ʧ��Կ��δ�����\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "�� 1 ��ǩ����Ϊij�������δ�����\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "�� %d ��ǩ����ΪijЩ�����δ�����\n"
@@ -2454,12 +2461,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�û���ʶ��%s���ѱ�������"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ȼ��ҪΪ��ǩ����(y/N)"
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  �޷�����ǩ�֡�\n"
 
@@ -2657,7 +2664,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "���Ҫǩ���� "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3010,242 +3017,242 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "��ʾ��Ƭ��ʶ"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��ȡ��Կ���顮%s��ʱ������%s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "˽Կ���á�\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "Ҫ��˽Կ������ô����\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "����ʹ�á�toggle��ָ�\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "��Կ�ѱ�������"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���Ϊ���е��û���ʶǩ���� "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��ʾ��ѡ��Ҫ����ǩ�ֵ��û���ʶ\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "�� %s ģʽ�в�����ʹ�����ָ�\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "�����ٵ�ѡ��һ���û���ʶ��\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "������ɾ�����һ���û���ʶ��\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���Ҫɾ�����б�ѡ����û���ʶ�� "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Ҫɾ������û���ʶ�� "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "���Ҫɾ������û���ʶ�� "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ѡ������һ����Կ��\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "������ѡ������һ����Կ��\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�������Ҫɾ����ѡ�����Կ�� "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�����Ҫɾ�������Կ�� "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���Ҫ�������б�ѡ����û���ʶ�� "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Ҫ��������û���ʶ�� "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "�������Ҫ������Щ��ѡ�����Կ�� "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "�������Ҫ���������Կ�� "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "�趨��ѡ��"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���Ҫ���±�ѡ���û���ʶ����ѡ���� "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "���Ҫ������ѡ���� "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ҫ����䶯�� "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ҫ��������뿪�� "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "����ʧ�ܣ�%s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "����˽Կʧ�ܣ�%s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "��Կû�б䶯���Բ���Ҫ���¡�\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "ɢ�У�"
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "�ص㣺"
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�����Կ�ɱ��� %s ��Կ������"
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " (���е�)"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�޷����� %s��%s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[�ѵ���]"
 
 #  of subkey
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [��������%s]"
 
 #  of subkey
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [��������%s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " ���ζȣ� %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " ���ζȣ� %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "�����Կ�Ѿ�������"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[�ѵ���]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x ��ʽ���û���ʶû����ѡ�\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3253,7 +3260,7 @@ msgstr ""
 "��ע�⣬������������֮ǰ��\n"
 "��ʾ����Կ��Ч��δ����ȷ��\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3261,7 +3268,7 @@ msgstr ""
 "���棺û��һ���û���ʶ�����Ϊ��ѡ�û���ʶ����������ܼٶ�һ����ͬ\n"
 "      ���û���ʶ����ѡ�û���ʶ��\n"
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3270,45 +3277,45 @@ msgstr ""
 "���棺����һ�� PGP2 ��ʽ����Կ��\n"
 "      ������Ƭ��ʶ���ܻᵼ��ijЩ�汾�� PGP ����ʶ�������Կ��\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "��ȷ����Ȼ��Ҫ������(y/N)"
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�������԰���Ƭ��ʶ���ӵ� PGP2 ��ʽ����Կ�\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "ɾ�������õ�ǩ����(y/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "ɾ�������Ч��ǩ����(y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "ɾ�����δ֪��ǩ����(y/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���Ҫɾ���������ǩ����(y/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "�Ѿ�ɾ���� %d ��ǩ�֡�\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "û�ж�����ɾ����\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3317,162 +3324,162 @@ msgstr ""
 "���棺����һ�� PGP2 ��ʽ����Կ��\n"
 "     ����ָ�������߿��ܻᵼ��ijЩ�汾�� PGP �޷�ʶ�������Կ��\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "��������Ϊ PGP 2.x ��ʽ����Կ����ָ�������ߡ�\n"
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "����ָ�������ߵ��û���ʶ��"
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 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:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�����ܽ�ij����Կ��Ϊ���Լ���ָ��������\n"
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "���棺�����Կ�Ѿ�������ָ�������ߵ����ˣ�\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "���棺��ij����Կָ��Ϊָ�������ߵIJ����޷�������\n"
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "��ȷ��Ҫ�������Կ��Ϊָ����������(y/N)��"
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "���˽Կ��ɾ��ѡ��\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "������ѡ��һ����Կ��\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "���ڱ����Կ��ʹ�����ޡ�\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�����ܱ��v3��Կ��ʹ������\n"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "��˽Կ����û��һ�µ�ǩ��\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "�뾫ȷ��ѡ��һ���û���ʶ��\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "���������û���ʶ��%s���� v3 ����ǩ��\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "��ȷ��Ҫ������(y/N)"
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "��ȷ��Ҫ������(y/N)"
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "û������Ϊ %d ���û���ʶ\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "û������Ϊ %d ����Կ\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�û���ʶ����"
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   �� %08lX �� %s%s%s ����ǩ��\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (���ɵ���)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ǩ������ %s ���ڡ�\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "��ȷ������Ȼ��Ҫ��������(y/N)"
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "ҪΪ���ǩ������һ�ݵ���֤����(y/N)"
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "���Ѿ�Ϊ��Щ�û���ʶ����ǩ�֣�\n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (���ɵ���)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   �� %08lX ������ %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ڵ�����Щǩ�֣�\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "���Ҫ���ɵ���֤����(y/N)"
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "û��˽Կ\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�û���ʶ��%s���Ѿ���������\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "���棺��һ���û���ʶǩ�ֵ����ڱ��Ϊ %d ����δ��\n"
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "������ʾ %s ��Ƭ��ʶ(��СΪ %ld��������Կ 0x%08lX���û���ʶ %d)\n"
@@ -3969,109 +3976,109 @@ msgstr ""
 msgid "never     "
 msgstr "��������"
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "�ؼ�ǩ�ֲ��ԣ�"
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "ǩ�ֲ��ԣ�"
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "���棺�ҵ���Ч�ı������\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "�ؼ�ǩ�ֱ�ǣ�"
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "ǩ�ֱ�ǣ�"
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "���������ܶ�����"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "Կ�׻�"
 
 #  of subkey
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [��������%s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "��Կָ�ƣ�"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "��Կָ�ƣ�"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " ��Կָ�ƣ�"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr " ��Կָ�ƣ�"
 
 #  use tty
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " ��Կָ�� ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "���� ASCII ��װʧ�ܣ�%s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "���棺�����ļ������л���ì�ܵ���Ϣ��\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ��û�иı����һ��\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ���µ���һ��\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "���޲�������ܵİ�ȫ��©��\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ڼ��Կ�׻���%s��\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "�Ѽ�� %lu ����Կ(%lu ��ǩ��)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s��Կ�׻��ѽ���\n"
@@ -4194,11 +4201,6 @@ msgstr "�޷��ӹ�Կ���������գ�%s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "�Ҳ�����%s����Կ��%s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4625,7 +4627,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "������������⣺�������򷵻� 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "��������ģʽ���޷�ѯ������\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4702,23 +4705,23 @@ msgstr "������Ƭ��ȷ��(y/N/q)"
 msgid "unable to display photo ID!\n"
 msgstr "�޷���ʾ��Ƭ��ʶ��\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "δָ��ԭ��"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "��Կ���滻"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "��Կ��й©"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "��Կ����ʹ��"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "�û���ʶ������Ч"
 
@@ -4790,7 +4793,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "���ľ�����ʲô��"
 
@@ -4939,8 +4942,8 @@ msgid "skipped: public key already set\n"
 msgstr "����������Կ�ѱ��趨\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "δ֪��Ĭ���ռ��ߡ�%s��\n"
 
 #: g10/pkclist.c:948
@@ -4969,15 +4972,15 @@ msgstr "�����ǩ�֡�\n"
 msgid "Please enter name of data file: "
 msgstr "�����������ļ������ƣ� "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "���ڴӱ�׼�����ȡ ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "����ǩ�ֵ�����\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�޷�����ǩ�ֵ����ݡ�%s��\n"
@@ -5015,7 +5018,7 @@ msgid "NOTE: key has been revoked"
 msgstr "ע�⣺��Կ�ѱ�����"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet ʧ�ܣ�%s\n"
@@ -5025,65 +5028,65 @@ msgstr "build_packet ʧ�ܣ�%s\n"
 msgid "key %s has no user IDs\n"
 msgstr "��Կ %08lX��û���û���ʶ\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "���������������ߣ�\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "(����һ�����еĵ�����Կ)\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "ҪΪ�����Կ����һ�ݵ���֤���� "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "��ǿ��ʹ�� ASCII ��װ���������\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet ʧ�ܣ� %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "�ѽ�������֤�顣\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "û���ҵ���%s���õĵ�����Կ\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "�Ҳ�����%s��˽Կ��%s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "û�����Ӧ�Ĺ�Կ��%s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "��Կ��˽Կ���Ǻϣ�\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "ҪΪ�����Կ����һ�ݵ���֤���� "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "δ֪�ı����㷨\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "ע�⣺�����Կû�б�������\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5102,33 +5105,33 @@ msgstr ""
 "����ǧ��С�ģ����Ļ����ϵĴ�ӡϵͳ���ܻ��ڴ�ӡ��\n"
 "���а���Щ������ʱ��ij��������Ҳ�ܹ����õ��ĵط���\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "��ѡ�������ԭ��\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "ȡ��"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "(Ҳ��������Ҫ������ѡ��%d)\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "����������(��ѡ)���Կհ��н�����\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "����ԭ��%s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "(����������)\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "���������� "
@@ -5281,58 +5284,51 @@ msgstr "%sǩ�����ԣ���%s��\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "����д�롮%s��\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "ǿ��ʹ�õ� %s (%d)ɢ���㷨�����ռ��ߵ���ѡ����\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "����ǩ�֣�"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "�޷����ļ���%s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "���� --pgp2 ģʽ��ֻ�ܹ�ʹ�� PGP 2.x ��ʽ����Կ��������ǩ��\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s ���ܽ�������\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "��Կδ����ʾΪ����ȫ����������ٵ��������������ͬʹ�ã�\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "��%s�����������ظ�\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "��%s����������%s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "��������˽Կ�Ѵ���\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "��%s��������������һ���� PGP ���ɵ� ElGamal ��Կ������ǩ�ֲ���ȫ��\n"
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
@@ -5958,6 +5954,20 @@ msgstr "��ȫ�ڴ�δ��ʼ�������ܽ��в���\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(������ʹ���˴���ij�������ɴ�������)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "��Ǹ����������ģʽ���޷���ɴ˲���\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "�Ҳ�����%s����Կ��%s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "�޷�������%s����%s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "�޷����ļ���%s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                �༴ \""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a85bf287d..5deedbb0f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2004-10-26 18:05+0200\n"
+"POT-Creation-Date: 2004-10-28 10:59+0200\n"
 "PO-Revision-Date: 2003-05-13 15:48+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -38,9 +38,10 @@ msgstr "��������üƻ`���Ҳ�\n"
 
 #: cipher/random.c:387 g10/card-util.c:594 g10/dearmor.c:60 g10/dearmor.c:109
 #: g10/encode.c:181 g10/encode.c:488 g10/g10.c:3194 g10/import.c:175
-#: g10/keygen.c:2236 g10/openfile.c:180 g10/openfile.c:333 g10/sign.c:761
-#: g10/sign.c:1020 g10/sign.c:1165 g10/tdbdump.c:140 g10/tdbdump.c:148
-#: g10/tdbio.c:539 g10/tdbio.c:600
+#: g10/keygen.c:2236 g10/keyring.c:1524 g10/openfile.c:180 g10/openfile.c:333
+#: g10/plaintext.c:468 g10/sign.c:761 g10/sign.c:912 g10/sign.c:1020
+#: g10/sign.c:1164 g10/tdbdump.c:140 g10/tdbdump.c:148 g10/tdbio.c:539
+#: g10/tdbio.c:600
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�L�k�}�� `%s' �G %s\n"
@@ -72,8 +73,9 @@ msgstr "�L�kŪ�� `%s' �G %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "�Ъ`�N�G random_seed �ɮץ��Q��s\n"
 
-#: cipher/random.c:473 g10/keygen.c:2704 g10/keygen.c:2734 g10/keyring.c:1496
-#: g10/openfile.c:257 g10/openfile.c:348 g10/tdbio.c:535
+#: cipher/random.c:473 g10/exec.c:489 g10/keygen.c:2704 g10/keygen.c:2734
+#: g10/keyring.c:1200 g10/keyring.c:1500 g10/openfile.c:257 g10/openfile.c:348
+#: g10/sign.c:778 g10/sign.c:1035 g10/tdbio.c:535
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�L�k�إ� `%s' �G %s\n"
@@ -295,9 +297,11 @@ msgstr "�L�k���Ψp�_"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:70 g10/keygen.c:2420 g10/revoke.c:215 g10/revoke.c:415
-msgid "sorry, can't do this in batch mode\n"
-msgstr "��p�A�L�k�b�妸�Ҧ����o�˰�\n"
+#: g10/card-util.c:70 g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1314
+#: g10/keygen.c:2420 g10/revoke.c:216 g10/revoke.c:417
+#, fuzzy
+msgid "can't do this in batch mode\n"
+msgstr "�L�k�b�妸�Ҧ������˰�\n"
 
 #: g10/card-util.c:94 g10/card-util.c:977 g10/card-util.c:1059
 #: g10/keyedit.c:412 g10/keyedit.c:433 g10/keyedit.c:447 g10/keygen.c:1298
@@ -471,7 +475,7 @@ msgid "   (3) Authentication key\n"
 msgstr ""
 
 #: g10/card-util.c:988 g10/card-util.c:1070 g10/keyedit.c:907
-#: g10/keygen.c:1395 g10/revoke.c:639
+#: g10/keygen.c:1395 g10/revoke.c:642
 msgid "Invalid selection.\n"
 msgstr "�L�Ī���ܡC\n"
 
@@ -630,11 +634,7 @@ msgstr "passwd"
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1198 g10/delkey.c:120 g10/keyedit.c:1313
-msgid "can't do that in batchmode\n"
-msgstr "�L�k�b�妸�Ҧ������˰�\n"
-
-#: g10/card-util.c:1246 g10/keyedit.c:1393
+#: g10/card-util.c:1246 g10/keyedit.c:1397
 msgid "Command> "
 msgstr "���O> "
 
@@ -643,7 +643,17 @@ msgstr "���O> "
 msgid "Admin-only command\n"
 msgstr "���O�����٬�\n"
 
-#: g10/card-util.c:1356 g10/keyedit.c:1860
+#: g10/card-util.c:1297
+#, fuzzy
+msgid "Admin commands are allowed\n"
+msgstr "���O�����٬�\n"
+
+#: g10/card-util.c:1299
+#, fuzzy
+msgid "Admin commands are not allowed\n"
+msgstr "���b�N�p�_�g�� `%s'\n"
+
+#: g10/card-util.c:1360 g10/keyedit.c:1864
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�L�Ī����O  (�ոլ� \"help\")\n"
 
@@ -670,8 +680,8 @@ msgstr ""
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/verify.c:101
-#: g10/verify.c:154
+#: g10/decrypt.c:68 g10/decrypt.c:157 g10/g10.c:3544 g10/keyring.c:376
+#: g10/keyring.c:662 g10/verify.c:101 g10/verify.c:154
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�L�k�}�� `%s'\n"
@@ -680,13 +690,14 @@ msgstr "�L�k�}�� `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output �b�o�өR�O���S���@��\n"
 
-#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2917 g10/revoke.c:225
-#, c-format
-msgid "key `%s' not found: %s\n"
+#: g10/delkey.c:74 g10/export.c:162 g10/keyedit.c:2921 g10/keyserver.c:1414
+#: g10/revoke.c:226
+#, fuzzy, c-format
+msgid "key \"%s\" not found: %s\n"
 msgstr "�䤣�� `%s' ���_�G %s\n"
 
-#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:231
-#: g10/revoke.c:436
+#: g10/delkey.c:82 g10/export.c:192 g10/keyserver.c:1428 g10/revoke.c:232
+#: g10/revoke.c:439
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "Ū�����_�϶��ɵo�Ϳ��~�G %s\n"
@@ -696,7 +707,8 @@ msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(���D�p�������w�F���_)\n"
 
 #: g10/delkey.c:127
-msgid "can't do that in batchmode without \"--yes\"\n"
+#, fuzzy
+msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "�b�妸�Ҧ����A�S�� \"--yes\" �N�S��k�o��\n"
 
 #: g10/delkey.c:139
@@ -727,7 +739,7 @@ msgstr "���_ \"%s\" ���۹������p�_�I\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "�Х��H \"--delete-secret-keys\" �ﶵ�ӧR�����C\n"
 
-#: g10/encode.c:210 g10/sign.c:1185
+#: g10/encode.c:210 g10/sign.c:1184
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "�إ߱K�X�ꪺ�ɭԵo�Ϳ��~�G %s\n"
@@ -771,7 +783,7 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) ��٦��s�K�k�|�H�Ϧ���̰��n�]�w\n"
 
-#: g10/encode.c:648 g10/sign.c:877
+#: g10/encode.c:648 g10/sign.c:876
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -841,11 +853,6 @@ msgstr "�L�k���� %s \"%s\": %s\n"
 msgid "unable to execute shell `%s': %s\n"
 msgstr "�L�k���� %s \"%s\": %s\n"
 
-#: g10/exec.c:489 g10/sign.c:778 g10/sign.c:1035
-#, fuzzy, c-format
-msgid "can't create file `%s': %s\n"
-msgstr "�L�k�إ� `%s' �G %s\n"
-
 #: g10/exec.c:521
 #, c-format
 msgid "system error while calling external program: %s\n"
@@ -1139,7 +1146,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "���_�G "
 
-#: g10/g10.c:766 g10/keyedit.c:1897
+#: g10/g10.c:766 g10/keyedit.c:1901
 msgid "Cipher: "
 msgstr "�s�K�k�G "
 
@@ -1147,7 +1154,7 @@ msgstr "�s�K�k�G "
 msgid "Hash: "
 msgstr "����G "
 
-#: g10/g10.c:778 g10/keyedit.c:1943
+#: g10/g10.c:778 g10/keyedit.c:1947
 msgid "Compression: "
 msgstr "���Y�G "
 
@@ -1266,7 +1273,7 @@ msgstr "�s�K�k�����Ҳ� \"%s\" �]���\�i���w���ӥ��Q���J\n"
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ���O�@�Ӧ��Ī��r����\n"
 
-#: g10/g10.c:2279 g10/keyedit.c:3433
+#: g10/g10.c:2279 g10/keyedit.c:3437
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�L�k���R���_���A�� URI\n"
@@ -2378,29 +2385,29 @@ msgstr "[�M�P]"
 msgid "[self-signature]"
 msgstr "[�ۧ�ñ��]"
 
-#: g10/keyedit.c:332 g10/keylist.c:326
+#: g10/keyedit.c:332 g10/keylist.c:342
 msgid "1 bad signature\n"
 msgstr "1 �ӷl�a��ñ��\n"
 
-#: g10/keyedit.c:334 g10/keylist.c:328
+#: g10/keyedit.c:334 g10/keylist.c:344
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d �ӷl�a��ñ��\n"
 
-#: g10/keyedit.c:336 g10/keylist.c:330
+#: g10/keyedit.c:336 g10/keylist.c:346
 msgid "1 signature not checked due to a missing key\n"
 msgstr "�� 1 ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
 
-#: g10/keyedit.c:338 g10/keylist.c:332
+#: g10/keyedit.c:338 g10/keylist.c:348
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "�� %d ��ñ���]���򥢪��_�ӥ��Q�ˬd\n"
 
-#: g10/keyedit.c:340 g10/keylist.c:334
+#: g10/keyedit.c:340 g10/keylist.c:350
 msgid "1 signature not checked due to an error\n"
 msgstr "�� 1 ��ñ���]���Y�ӿ��~�ӥ��Q�ˬd\n"
 
-#: g10/keyedit.c:342 g10/keylist.c:336
+#: g10/keyedit.c:342 g10/keylist.c:352
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "�� %d ��ñ���]���Y�ǿ��~�ӥ��Q�ˬd\n"
@@ -2453,12 +2460,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C"
 
 #: g10/keyedit.c:593 g10/keyedit.c:619 g10/keyedit.c:644 g10/keyedit.c:799
-#: g10/keyedit.c:857 g10/keyedit.c:1482
+#: g10/keyedit.c:857 g10/keyedit.c:1486
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�p���M�Q�nñ�p���ܡH (y/N) "
 
 #: g10/keyedit.c:605 g10/keyedit.c:631 g10/keyedit.c:656 g10/keyedit.c:805
-#: g10/keyedit.c:1488
+#: g10/keyedit.c:1492
 msgid "  Unable to sign.\n"
 msgstr "  �L�kñ�p�C\n"
 
@@ -2656,7 +2663,7 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u���nñ�p�ܡH "
 
-#: g10/keyedit.c:1028 g10/keyedit.c:3881 g10/keyedit.c:3972 g10/keyedit.c:4045
+#: g10/keyedit.c:1028 g10/keyedit.c:3885 g10/keyedit.c:3976 g10/keyedit.c:4049
 #: g10/sign.c:369
 #, c-format
 msgid "signing failed: %s\n"
@@ -3009,240 +3016,240 @@ msgstr "showphoto"
 msgid "show photo ID"
 msgstr "��ܷӤ� ID"
 
-#: g10/keyedit.c:1344
-#, c-format
-msgid "error reading secret keyblock `%s': %s\n"
+#: g10/keyedit.c:1347
+#, fuzzy, c-format
+msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Ū�����_�϶� `%s' �ɵo�Ϳ��~�G %s\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1365
 msgid "Secret key is available.\n"
 msgstr "�p�_�i�ΡC\n"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1427
 msgid "Need the secret key to do this.\n"
 msgstr "�n���p�_�ׯ�o�򰵡C\n"
 
-#: g10/keyedit.c:1428
+#: g10/keyedit.c:1432
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�Х��ϥ� \"toggle\" ���O�C\n"
 
-#: g10/keyedit.c:1476
+#: g10/keyedit.c:1480
 msgid "Key is revoked."
 msgstr "���_�w�g�Q�M�P�F�C"
 
-#: g10/keyedit.c:1496
+#: g10/keyedit.c:1500
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u���nñ�p�Ҧ����ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1498
+#: g10/keyedit.c:1502
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "���ܡG��ܭnñ�p���ϥΪ� ID\n"
 
-#: g10/keyedit.c:1523
+#: g10/keyedit.c:1527
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "�b %s �Ҧ��������\�ϥγo�ӫ��O�C\n"
 
-#: g10/keyedit.c:1545 g10/keyedit.c:1565 g10/keyedit.c:1668
+#: g10/keyedit.c:1549 g10/keyedit.c:1569 g10/keyedit.c:1672
 msgid "You must select at least one user ID.\n"
 msgstr "�p�ܤֱo��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:1547
+#: g10/keyedit.c:1551
 msgid "You can't delete the last user ID!\n"
 msgstr "�p����R���̫�@�ӨϥΪ� ID �I\n"
 
-#: g10/keyedit.c:1549
+#: g10/keyedit.c:1553
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u���n�����Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1550
+#: g10/keyedit.c:1554
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1600
+#: g10/keyedit.c:1604
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u���n�����o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1612
+#: g10/keyedit.c:1616
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "�p�ܤ֥�����ܤ@����_�C\n"
 
-#: g10/keyedit.c:1632 g10/keyedit.c:1687
+#: g10/keyedit.c:1636 g10/keyedit.c:1691
 msgid "You must select at least one key.\n"
 msgstr "�p�ܤ֥�����ܤ@����_�C\n"
 
-#: g10/keyedit.c:1635
+#: g10/keyedit.c:1639
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�p�u���Q�n�R���Q��ܪ����_�ܡH "
 
-#: g10/keyedit.c:1636
+#: g10/keyedit.c:1640
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�p�u���n�R���o����_�ܡH "
 
-#: g10/keyedit.c:1671
+#: g10/keyedit.c:1675
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u���n�M�P�Ҧ��Q��ܪ��ϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1672
+#: g10/keyedit.c:1676
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u���n�M�P�o�ӨϥΪ� ID �ܡH "
 
-#: g10/keyedit.c:1691
+#: g10/keyedit.c:1695
 #, fuzzy
 msgid "Do you really want to revoke the selected keys? (y/N) "
 msgstr "�p�u���Q�n�M�P�o�dzQ��ܪ����_�ܡH "
 
-#: g10/keyedit.c:1692
+#: g10/keyedit.c:1696
 #, fuzzy
 msgid "Do you really want to revoke this key? (y/N) "
 msgstr "�p�u���Q�n�M�P�o����_�ܡH "
 
-#: g10/keyedit.c:1731
+#: g10/keyedit.c:1735
 msgid ""
 "Owner trust may not be set while using an user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:1763
+#: g10/keyedit.c:1767
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "�]�w���n�M��"
 
-#: g10/keyedit.c:1769
+#: g10/keyedit.c:1773
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u���n��s�Q��ܨϥΪ� ID �����n�ܡH "
 
-#: g10/keyedit.c:1771
+#: g10/keyedit.c:1775
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u���n��s���n�ܡH "
 
-#: g10/keyedit.c:1821
+#: g10/keyedit.c:1825
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�n�x�s�ܧ�ܡH "
 
-#: g10/keyedit.c:1824
+#: g10/keyedit.c:1828
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�n���x�s�����}�ܡH "
 
-#: g10/keyedit.c:1834
+#: g10/keyedit.c:1838
 #, c-format
 msgid "update failed: %s\n"
 msgstr "��s���ѡG %s\n"
 
-#: g10/keyedit.c:1841
+#: g10/keyedit.c:1845
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��s�p�_���ѡG %s\n"
 
-#: g10/keyedit.c:1848
+#: g10/keyedit.c:1852
 msgid "Key not changed so no update needed.\n"
 msgstr "���_�S���ܧ�ҥH���ݭn��s�C\n"
 
-#: g10/keyedit.c:1920
+#: g10/keyedit.c:1924
 msgid "Digest: "
 msgstr "�K�n�G "
 
-#: g10/keyedit.c:1972
+#: g10/keyedit.c:1976
 msgid "Features: "
 msgstr "�S�I�G "
 
-#: g10/keyedit.c:1983
+#: g10/keyedit.c:1987
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:1998 g10/keylist.c:229
+#: g10/keyedit.c:2002 g10/keylist.c:244
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2239
+#: g10/keyedit.c:2243
 #, c-format
 msgid "This key may be revoked by %s key "
 msgstr "�o����_�i��Q %s ���_�M�P�F "
 
-#: g10/keyedit.c:2243
+#: g10/keyedit.c:2247
 msgid " (sensitive)"
 msgstr " �]���K���^"
 
-#: g10/keyedit.c:2257 g10/keyedit.c:2313 g10/keyedit.c:2434 g10/keyedit.c:2449
+#: g10/keyedit.c:2261 g10/keyedit.c:2317 g10/keyedit.c:2438 g10/keyedit.c:2453
 #: g10/keyserver.c:366
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�L�k�إ� %s: %s\n"
 
-#: g10/keyedit.c:2260 g10/keylist.c:707 g10/keylist.c:807 g10/mainproc.c:929
+#: g10/keyedit.c:2264 g10/keylist.c:723 g10/keylist.c:823 g10/mainproc.c:929
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[�w�M�P]"
 
-#: g10/keyedit.c:2262 g10/keylist.c:678 g10/keylist.c:813
+#: g10/keyedit.c:2266 g10/keylist.c:694 g10/keylist.c:829
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keyedit.c:2264 g10/keyedit.c:2315 g10/keyedit.c:2436 g10/keyedit.c:2451
-#: g10/keylist.c:684 g10/keylist.c:719 g10/keylist.c:819 g10/keylist.c:840
+#: g10/keyedit.c:2268 g10/keyedit.c:2319 g10/keyedit.c:2440 g10/keyedit.c:2455
+#: g10/keylist.c:700 g10/keylist.c:735 g10/keylist.c:835 g10/keylist.c:856
 #: g10/keyserver.c:372 g10/mainproc.c:935
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keyedit.c:2266
+#: g10/keyedit.c:2270
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �H���G %c/%c"
 
-#: g10/keyedit.c:2281
+#: g10/keyedit.c:2285
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �H���G %c/%c"
 
-#: g10/keyedit.c:2285
+#: g10/keyedit.c:2289
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2292
+#: g10/keyedit.c:2296
 msgid "This key has been disabled"
 msgstr "�o����_�w�g�Q�T�ΤF"
 
-#: g10/keyedit.c:2320
+#: g10/keyedit.c:2324
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2357 g10/keyedit.c:2359
+#: g10/keyedit.c:2359 g10/keyedit.c:2361 g10/keyedit.c:2363
 #, c-format
 msgid "[%8.8s] "
 msgstr ""
 
-#: g10/keyedit.c:2355 g10/keyedit.c:2468 g10/keylist.c:766 g10/keyserver.c:376
+#: g10/keyedit.c:2359 g10/keyedit.c:2472 g10/keylist.c:782 g10/keyserver.c:376
 #: g10/mainproc.c:1575 g10/trustdb.c:1133
 #, fuzzy
 msgid "revoked"
 msgstr "[�w�M�P]"
 
-#: g10/keyedit.c:2357 g10/keyedit.c:2470 g10/keylist.c:768 g10/keyserver.c:380
+#: g10/keyedit.c:2361 g10/keyedit.c:2474 g10/keylist.c:784 g10/keyserver.c:380
 #: g10/mainproc.c:1577 g10/trustdb.c:500
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:2396
+#: g10/keyedit.c:2400
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x ���A���ϥΪ� ID �S�����n�C\n"
 
-#: g10/keyedit.c:2404
+#: g10/keyedit.c:2408
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3250,13 +3257,13 @@ msgstr ""
 "�Ъ`�N��ܥX�Ӫ����_���ĩʤ��ݭn�󥿡A\n"
 "���D�p���s����{���C\n"
 
-#: g10/keyedit.c:2535
+#: g10/keyedit.c:2539
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:2595
+#: g10/keyedit.c:2599
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3265,45 +3272,45 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[�Ӥ� ID �i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2600 g10/keyedit.c:2878
+#: g10/keyedit.c:2604 g10/keyedit.c:2882
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�p�T�w���M�Q�n�W�[�ܡH (y/N) "
 
-#: g10/keyedit.c:2606
+#: g10/keyedit.c:2610
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�p���i�H��Ӥ� ID �W�[�� PGP2 ���A�����_�̡C\n"
 
-#: g10/keyedit.c:2746
+#: g10/keyedit.c:2750
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�R���o�ӧ��n��ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2756
+#: g10/keyedit.c:2760
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�R���o�ӵL�Ī�ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2760
+#: g10/keyedit.c:2764
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�R���o�ӥ�����ñ���ܡH (y/N/q)"
 
-#: g10/keyedit.c:2766
+#: g10/keyedit.c:2770
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u���n�R���o�Ӧۧ�ñ���ܡH (y/N)"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2784
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2781
+#: g10/keyedit.c:2785
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "�w�g�R���F %d ���C\n"
 
-#: g10/keyedit.c:2784
+#: g10/keyedit.c:2788
 msgid "Nothing deleted.\n"
 msgstr "�S���F��Q�R���C\n"
 
-#: g10/keyedit.c:2873
+#: g10/keyedit.c:2877
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -3312,159 +3319,159 @@ msgstr ""
 "ĵ�i�G�o�O�@�� PGP2 ���A�����_�C\n"
 "      �W�[���w�M�P�̥i��|�ɭP�Y�Ǫ����� PGP ��^�o����_�C\n"
 
-#: g10/keyedit.c:2884
+#: g10/keyedit.c:2888
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�p���i�H����w�M�P�̼W�[�� PGP2 ���A�����_�̡C\n"
 
-#: g10/keyedit.c:2904
+#: g10/keyedit.c:2908
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��J���w�M�P�̪��ϥΪ� ID �G "
 
-#: g10/keyedit.c:2927
+#: g10/keyedit.c:2931
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "�L�k�N PGP 2.x ���A�����_���������w�M�P��\n"
 
-#: g10/keyedit.c:2942
+#: g10/keyedit.c:2946
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "�p��������Y����_�����ۤv�����w�M�P��\n"
 
-#: g10/keyedit.c:2964
+#: g10/keyedit.c:2968
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ĵ�i�G�o����_�w�g�Q���������H�M�P�F�I\n"
 
-#: g10/keyedit.c:2983
+#: g10/keyedit.c:2987
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ĵ�i�G�@����Y����_���������w�M�P�̫�A�N�L�k�Ϯ��F�I\n"
 
-#: g10/keyedit.c:2989
+#: g10/keyedit.c:2993
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�p�T�w�n�����o����_�����w�M�P�̶ܡH (y/N): "
 
-#: g10/keyedit.c:3050
+#: g10/keyedit.c:3054
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�бq�p�_��������ܡC\n"
 
-#: g10/keyedit.c:3056
+#: g10/keyedit.c:3060
 msgid "Please select at most one secondary key.\n"
 msgstr "�Цܦh��ܤ@�⦸�_�C\n"
 
-#: g10/keyedit.c:3060
+#: g10/keyedit.c:3064
 msgid "Changing expiration time for a secondary key.\n"
 msgstr "���b�ܧ�Y�⦸�_���ϥδ����C\n"
 
-#: g10/keyedit.c:3063
+#: g10/keyedit.c:3067
 msgid "Changing expiration time for the primary key.\n"
 msgstr "���b�ܧ�D�_���ϥδ����C\n"
 
-#: g10/keyedit.c:3109
+#: g10/keyedit.c:3113
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�p�����ܧ� v3 ���_���ϥδ���\n"
 
-#: g10/keyedit.c:3125
+#: g10/keyedit.c:3129
 msgid "No corresponding signature in secret ring\n"
 msgstr "�b�p�_��̨S���@�P��ñ��\n"
 
-#: g10/keyedit.c:3205
+#: g10/keyedit.c:3209
 msgid "Please select exactly one user ID.\n"
 msgstr "�к�T�a��ܤ@�ӨϥΪ� ID �C\n"
 
-#: g10/keyedit.c:3244 g10/keyedit.c:3354 g10/keyedit.c:3473
+#: g10/keyedit.c:3248 g10/keyedit.c:3358 g10/keyedit.c:3477
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "���b�ϥΪ� ID \"%s\" ���L v3 �ۧ�ñ��\n"
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3419
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:3494
+#: g10/keyedit.c:3498
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�p�T�w�n�Υ��ܡH (y/N) "
 
-#: g10/keyedit.c:3495
+#: g10/keyedit.c:3499
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�p�T�w�n�Υ��ܡH (y/N) "
 
-#: g10/keyedit.c:3557
+#: g10/keyedit.c:3561
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "���� %d �S���ϥΪ� ID\n"
 
-#: g10/keyedit.c:3603
+#: g10/keyedit.c:3607
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "���� %d �S�����_\n"
 
-#: g10/keyedit.c:3720
+#: g10/keyedit.c:3724
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�ϥΪ� ID�G \""
 
-#: g10/keyedit.c:3723 g10/keyedit.c:3787 g10/keyedit.c:3830
+#: g10/keyedit.c:3727 g10/keyedit.c:3791 g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   �� %08lX ñ�p�� %s%s%s\n"
 
-#: g10/keyedit.c:3725 g10/keyedit.c:3789 g10/keyedit.c:3832
+#: g10/keyedit.c:3729 g10/keyedit.c:3793 g10/keyedit.c:3836
 msgid " (non-exportable)"
 msgstr " (���i�ץX)"
 
-#: g10/keyedit.c:3729
+#: g10/keyedit.c:3733
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�o��ñ�p�w�g�b %s �L���F�C\n"
 
-#: g10/keyedit.c:3733
+#: g10/keyedit.c:3737
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�p�T�w�p���M�Q�n�M�P���ܡH (y/N) "
 
-#: g10/keyedit.c:3737
+#: g10/keyedit.c:3741
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�n���o��ñ���إߤ@���M�P���ҶܡH (y/N) "
 
-#: g10/keyedit.c:3764
+#: g10/keyedit.c:3768
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�p�w�gñ�p�F�o�ǨϥΪ� ID�G \n"
 
-#: g10/keyedit.c:3790
+#: g10/keyedit.c:3794
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (���i�ץX)"
 
-#: g10/keyedit.c:3797
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   �� %08lX �M�P�� %s\n"
 
-#: g10/keyedit.c:3819
+#: g10/keyedit.c:3823
 msgid "You are about to revoke these signatures:\n"
 msgstr "�p���b�M�P�o���G\n"
 
-#: g10/keyedit.c:3839
+#: g10/keyedit.c:3843
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u���n�إߺM�P���ҶܡH (y/N) "
 
-#: g10/keyedit.c:3869
+#: g10/keyedit.c:3873
 msgid "no secret key\n"
 msgstr "�S���p�_\n"
 
-#: g10/keyedit.c:3939
+#: g10/keyedit.c:3943
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�ϥΪ� ID \"%s\" �w�g�Q�M�P�F�C\n"
 
-#: g10/keyedit.c:3956
+#: g10/keyedit.c:3960
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ĵ�i�G���@���ϥΪ� ID ñ��������аO�� %d ���᪺����\n"
 
-#: g10/keyedit.c:4125
+#: g10/keyedit.c:4129
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���b��� %s �ؤo�� %ld �����_ 0x%08lX (uid %d) ���Ӥ� ID\n"
@@ -3961,107 +3968,107 @@ msgstr ""
 msgid "never     "
 msgstr "�û����L��"
 
-#: g10/keylist.c:186
+#: g10/keylist.c:201
 msgid "Critical signature policy: "
 msgstr "������h�G "
 
-#: g10/keylist.c:188
+#: g10/keylist.c:203
 msgid "Signature policy: "
 msgstr "��h�G "
 
-#: g10/keylist.c:227
+#: g10/keylist.c:242
 msgid "Critical preferred keyserver: "
 msgstr ""
 
-#: g10/keylist.c:275 g10/keylist.c:319
+#: g10/keylist.c:291 g10/keylist.c:335
 msgid "WARNING: invalid notation data found\n"
 msgstr "ĵ�i�G���L�Ī��аO���\n"
 
-#: g10/keylist.c:293
+#: g10/keylist.c:309
 msgid "Critical signature notation: "
 msgstr "����ñ���аO�G "
 
-#: g10/keylist.c:295
+#: g10/keylist.c:311
 msgid "Signature notation: "
 msgstr "ñ���аO�G "
 
-#: g10/keylist.c:306
+#: g10/keylist.c:322
 msgid "not human readable"
 msgstr "���O�H����Ū�o����"
 
-#: g10/keylist.c:407
+#: g10/keylist.c:423
 msgid "Keyring"
 msgstr "�_�Ͱ�"
 
-#: g10/keylist.c:713
+#: g10/keylist.c:729
 #, fuzzy, c-format
 msgid "expired: %s)"
 msgstr " [���Ĵ����G %s]"
 
-#: g10/keylist.c:1415
+#: g10/keylist.c:1431
 msgid "Primary key fingerprint:"
 msgstr "�D�_�����G"
 
-#: g10/keylist.c:1417
+#: g10/keylist.c:1433
 msgid "     Subkey fingerprint:"
 msgstr "              �l�_�����G"
 
-#: g10/keylist.c:1424
+#: g10/keylist.c:1440
 msgid " Primary key fingerprint:"
 msgstr " �D�_�����G"
 
-#: g10/keylist.c:1426
+#: g10/keylist.c:1442
 msgid "      Subkey fingerprint:"
 msgstr "               �l�_�����G"
 
-#: g10/keylist.c:1430 g10/keylist.c:1434
+#: g10/keylist.c:1446 g10/keylist.c:1450
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "            ���_���� ="
 
-#: g10/keylist.c:1501
+#: g10/keylist.c:1517
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1242
+#: g10/keyring.c:1245
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�i��ʸ˥��ѡG %s\n"
 
-#: g10/keyring.c:1248
+#: g10/keyring.c:1251
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ĵ�i�G2 ���ɮצs�b�����ۥ٬ު���T�C\n"
 
-#: g10/keyring.c:1250
+#: g10/keyring.c:1253
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s �O�S�����ܪ����@��\n"
 
-#: g10/keyring.c:1251
+#: g10/keyring.c:1254
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s �O�s�����@��\n"
 
-#: g10/keyring.c:1252
+#: g10/keyring.c:1255
 msgid "Please fix this possible security flaw\n"
 msgstr "�Э׸ɳo�ӥi�઺�w���ʵ��_\n"
 
-#: g10/keyring.c:1372
+#: g10/keyring.c:1375
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���b�ˬd�_�Ͱ� `%s'\n"
 
-#: g10/keyring.c:1418
+#: g10/keyring.c:1421
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1433
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "�ثe�ˬd�F %lu ����_ (�� %lu ��ñ��)\n"
 
-#: g10/keyring.c:1501
+#: g10/keyring.c:1504
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �_�Ͱ�w�إ�\n"
@@ -4184,11 +4191,6 @@ msgstr "���ͪ��_���ѡG %s\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1414
-#, fuzzy, c-format
-msgid "key \"%s\" not found: %s\n"
-msgstr "�䤣�� `%s' ���_�G %s\n"
-
 #: g10/keyserver.c:1578
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
@@ -4618,7 +4620,8 @@ msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr "�N�z�{�������D�G�N�z�{���Ǧ^ 0x%lx\n"
 
 #: g10/passphrase.c:1053 g10/passphrase.c:1211
-msgid "can't query password in batchmode\n"
+#, fuzzy
+msgid "can't query password in batch mode\n"
 msgstr "�b�妸�Ҧ����L�k�߰ݱK�X\n"
 
 #: g10/passphrase.c:1058 g10/passphrase.c:1216
@@ -4695,23 +4698,23 @@ msgstr "�o�i�Ӥ����T�ܡH (y/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "�L�k��ܷӤ� ID �I\n"
 
-#: g10/pkclist.c:61 g10/revoke.c:577
+#: g10/pkclist.c:61 g10/revoke.c:580
 msgid "No reason specified"
 msgstr "�����w��]"
 
-#: g10/pkclist.c:63 g10/revoke.c:579
+#: g10/pkclist.c:63 g10/revoke.c:582
 msgid "Key is superseded"
 msgstr "���_�Q�N���F"
 
-#: g10/pkclist.c:65 g10/revoke.c:578
+#: g10/pkclist.c:65 g10/revoke.c:581
 msgid "Key has been compromised"
 msgstr "���_�w�g�Q���|�F"
 
-#: g10/pkclist.c:67 g10/revoke.c:580
+#: g10/pkclist.c:67 g10/revoke.c:583
 msgid "Key is no longer used"
 msgstr "���_���A�Q�ϥΤF"
 
-#: g10/pkclist.c:69 g10/revoke.c:581
+#: g10/pkclist.c:69 g10/revoke.c:584
 msgid "User ID is no longer valid"
 msgstr "�ϥΪ� ID ���A���ĤF"
 
@@ -4782,7 +4785,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:298 g10/revoke.c:606
+#: g10/pkclist.c:298 g10/revoke.c:609
 msgid "Your decision? "
 msgstr "�p���M�w�O�ƻ�H "
 
@@ -4933,8 +4936,8 @@ msgid "skipped: public key already set\n"
 msgstr "�w���L�G���_�w�g�Q�]�L�F\n"
 
 #: g10/pkclist.c:903
-#, c-format
-msgid "unknown default recipient `%s'\n"
+#, fuzzy, c-format
+msgid "unknown default recipient \"%s\"\n"
 msgstr "�������w�]����� `%s'\n"
 
 #: g10/pkclist.c:948
@@ -4963,15 +4966,15 @@ msgstr "�������C\n"
 msgid "Please enter name of data file: "
 msgstr "�п�J����ɪ��W�١G "
 
-#: g10/plaintext.c:476
+#: g10/plaintext.c:477
 msgid "reading stdin ...\n"
 msgstr "���b�q�зǿ�JŪ�� ...\n"
 
-#: g10/plaintext.c:510
+#: g10/plaintext.c:511
 msgid "no signed data\n"
 msgstr "�S���Qñ�p�L�����\n"
 
-#: g10/plaintext.c:524
+#: g10/plaintext.c:525
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�L�k�}�ҳQñ�p�L����� `%s'\n"
@@ -5009,7 +5012,7 @@ msgid "NOTE: key has been revoked"
 msgstr "�Ъ`�N�G���_�w�g�Q�M�P�F"
 
 #: g10/revoke.c:103 g10/revoke.c:117 g10/revoke.c:129 g10/revoke.c:175
-#: g10/revoke.c:187 g10/revoke.c:542
+#: g10/revoke.c:187 g10/revoke.c:545
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet ���ѡG %s\n"
@@ -5019,65 +5022,65 @@ msgstr "build_packet ���ѡG %s\n"
 msgid "key %s has no user IDs\n"
 msgstr "���_ %08lX: �S���ϥΪ� ID\n"
 
-#: g10/revoke.c:271
+#: g10/revoke.c:272
 msgid "To be revoked by:\n"
 msgstr "�N�Q�M�P�G\n"
 
-#: g10/revoke.c:275
+#: g10/revoke.c:276
 msgid "(This is a sensitive revocation key)\n"
 msgstr "�]�o�O����K���M�P���_�^\n"
 
-#: g10/revoke.c:279
+#: g10/revoke.c:280
 #, fuzzy
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
 
-#: g10/revoke.c:292 g10/revoke.c:508
+#: g10/revoke.c:293 g10/revoke.c:511
 msgid "ASCII armored output forced.\n"
 msgstr "�w�j���ϥ� ASCII �ʸ˹L����X�C\n"
 
-#: g10/revoke.c:306 g10/revoke.c:522
+#: g10/revoke.c:307 g10/revoke.c:525
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet ���ѡG %s\n"
 
-#: g10/revoke.c:369
+#: g10/revoke.c:370
 msgid "Revocation certificate created.\n"
 msgstr "�w�إߺM�P���ҡC\n"
 
-#: g10/revoke.c:375
-#, c-format
-msgid "no revocation keys found for `%s'\n"
+#: g10/revoke.c:376
+#, fuzzy, c-format
+msgid "no revocation keys found for \"%s\"\n"
 msgstr "�S����� `%s' ���M�P���_\n"
 
-#: g10/revoke.c:429
-#, c-format
-msgid "secret key `%s' not found: %s\n"
+#: g10/revoke.c:432
+#, fuzzy, c-format
+msgid "secret key \"%s\" not found: %s\n"
 msgstr "�䤣�� `%s' �p�_�G %s\n"
 
-#: g10/revoke.c:458
+#: g10/revoke.c:461
 #, c-format
 msgid "no corresponding public key: %s\n"
 msgstr "�S���۹��������_�G %s\n"
 
-#: g10/revoke.c:469
+#: g10/revoke.c:472
 msgid "public key does not match secret key!\n"
 msgstr "���_�P�p�_��k�X�I\n"
 
-#: g10/revoke.c:476
+#: g10/revoke.c:479
 #, fuzzy
 msgid "Create a revocation certificate for this key? (y/N) "
 msgstr "�n���o����_�إߤ@���M�P���ҶܡH "
 
-#: g10/revoke.c:493
+#: g10/revoke.c:496
 msgid "unknown protection algorithm\n"
 msgstr "�������O�@�t��k\n"
 
-#: g10/revoke.c:497
+#: g10/revoke.c:500
 msgid "NOTE: This key is not protected!\n"
 msgstr "�`�N�G�o����_�S���Q�O�@�I\n"
 
-#: g10/revoke.c:548
+#: g10/revoke.c:551
 msgid ""
 "Revocation certificate created.\n"
 "\n"
@@ -5096,33 +5099,33 @@ msgstr ""
 "���O�d�U�p�ߡG�p�������W���C�L�t�Υi��|�b�C�L�L\n"
 "�{����o�Ǹ�ƼȦs�b�Y�Ө�L�H�]����ݱo�쪺�a��I\n"
 
-#: g10/revoke.c:589
+#: g10/revoke.c:592
 msgid "Please select the reason for the revocation:\n"
 msgstr "�п�ܺM�P����]�G\n"
 
-#: g10/revoke.c:599
+#: g10/revoke.c:602
 msgid "Cancel"
 msgstr "����"
 
-#: g10/revoke.c:601
+#: g10/revoke.c:604
 #, c-format
 msgid "(Probably you want to select %d here)\n"
 msgstr "�]�]�\�p�|�Q�n�b�o�̿�� %d �^\n"
 
-#: g10/revoke.c:642
+#: g10/revoke.c:645
 msgid "Enter an optional description; end it with an empty line:\n"
 msgstr "�п�J��Ϊ��y�z�F�H�ťզC�����G\n"
 
-#: g10/revoke.c:670
+#: g10/revoke.c:673
 #, c-format
 msgid "Reason for revocation: %s\n"
 msgstr "�M�P��]�G %s\n"
 
-#: g10/revoke.c:672
+#: g10/revoke.c:675
 msgid "(No description given)\n"
 msgstr "�]�S�����w�y�z�^\n"
 
-#: g10/revoke.c:677
+#: g10/revoke.c:680
 #, fuzzy
 msgid "Is this okay? (y/N) "
 msgstr "�o�˥i�H�ܡH "
@@ -5275,58 +5278,51 @@ msgstr "%s ñ���ӦۡG \"%s\"\n"
 msgid "you can only detach-sign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
 
-#: g10/sign.c:784 g10/sign.c:1041
+#: g10/sign.c:783 g10/sign.c:1040
 #, fuzzy, c-format
 msgid "writing to file `%s'\n"
 msgstr "���b�g�� `%s'\n"
 
-#: g10/sign.c:808
+#: g10/sign.c:807
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "�j���ϥ� %s (%d) �K�n�t��k�|�H�Ϧ���̰��n�]�w\n"
 
-#: g10/sign.c:900
+#: g10/sign.c:899
 msgid "signing:"
 msgstr "ñ�p�G"
 
-#: g10/sign.c:912
-#, fuzzy, c-format
-msgid "can't open file `%s': %s\n"
-msgstr "�L�k�}���ɮסG %s\n"
-
 #: g10/sign.c:1006
 msgid "you can only clearsign with PGP 2.x style keys while in --pgp2 mode\n"
 msgstr "�p�b --pgp2 �Ҧ��U�����ϥ� PGP 2.x ���A�����_�Ӱ�����ñ�p\n"
 
-#: g10/sign.c:1179
+#: g10/sign.c:1178
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s �[�K�N�Q�ĥ�\n"
 
-#: g10/skclist.c:129 g10/skclist.c:185
+#: g10/skclist.c:129 g10/skclist.c:191
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "���_���Q�Хܬ����w�� �w ��������Ӹ򰲪��H���Ʀr���;��֥ΡI\n"
 
-#: g10/skclist.c:157
-#, c-format
-msgid "skipped `%s': duplicated\n"
+#: g10/skclist.c:158
+#, fuzzy, c-format
+msgid "skipped \"%s\": duplicated\n"
 msgstr "`%s' �w���L�G���ƤF\n"
 
-#: g10/skclist.c:164 g10/skclist.c:172
-#, c-format
-msgid "skipped `%s': %s\n"
+#: g10/skclist.c:166 g10/skclist.c:176 g10/skclist.c:185
+#, fuzzy, c-format
+msgid "skipped \"%s\": %s\n"
 msgstr "`%s' �w���L�G %s\n"
 
-#: g10/skclist.c:168
+#: g10/skclist.c:171
 msgid "skipped: secret key already present\n"
 msgstr "�w���L�G�p�_�w�g�s�b\n"
 
-#: g10/skclist.c:179
-#, fuzzy, c-format
-msgid ""
-"skipped `%s': this is a PGP generated Elgamal key which is not secure for "
-"signatures!\n"
+#: g10/skclist.c:186
+#, fuzzy
+msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "`%s' �w���L�G�o�O�@��� PGP ���ͪ� ElGamal ���_�A�Ω�ñ���ä��w���I\n"
 
 #: g10/tdbdump.c:59 g10/trustdb.c:365
@@ -5953,6 +5949,20 @@ msgstr "�|���ҥΦw�����O����e�A���i��i��ާ@\n"
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(�]�\�p����{���Ӱ��o��ƤF)\n"
 
+#~ msgid "sorry, can't do this in batch mode\n"
+#~ msgstr "��p�A�L�k�b�妸�Ҧ����o�˰�\n"
+
+#~ msgid "key `%s' not found: %s\n"
+#~ msgstr "�䤣�� `%s' ���_�G %s\n"
+
+#, fuzzy
+#~ msgid "can't create file `%s': %s\n"
+#~ msgstr "�L�k�إ� `%s' �G %s\n"
+
+#, fuzzy
+#~ msgid "can't open file `%s': %s\n"
+#~ msgstr "�L�k�}���ɮסG %s\n"
+
 #, fuzzy
 #~ msgid "          \""
 #~ msgstr "                ��Y \""
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index daa6d72de..f3938eb21 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -47,7 +47,7 @@ cp ${bindir}/g10/gpg.exe gpg.exe
 $STRIP gpg.exe
 cp ${bindir}/g10/gpgv.exe gpgv.exe
 $STRIP gpgv.exe
-for name in hkp http finger; do 
+for name in hkp http ldap finger; do 
   cp ${bindir}/keyserver/gpgkeys_$name.exe gpgkeys_$name.exe
   $STRIP gpgkeys_$name.exe
 done